Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed some Widget subclasses to be consistent about how they handle…

… the passed in 'attrs' parameter. We now always copy it (by calling the parent's __init__).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3c18331adc1fc45c9fec59991c1689cf751790e8 1 parent b1cc331
@malcolmt malcolmt authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 django/newforms/widgets.py
View
10 django/newforms/widgets.py
@@ -96,7 +96,7 @@ class PasswordInput(Input):
input_type = 'password'
def __init__(self, attrs=None, render_value=True):
- self.attrs = attrs or {}
+ super(PasswordInput, self).__init__(attrs)
self.render_value = render_value
def render(self, name, value, attrs=None):
@@ -113,8 +113,8 @@ class MultipleHiddenInput(HiddenInput):
of values.
"""
def __init__(self, attrs=None, choices=()):
+ super(MultipleHiddenInput, self).__init__(attrs)
# choices can be any iterable
- self.attrs = attrs or {}
self.choices = choices
def render(self, name, value, attrs=None, choices=()):
@@ -153,9 +153,9 @@ def render(self, name, value, attrs=None):
class CheckboxInput(Widget):
def __init__(self, attrs=None, check_test=bool):
+ super(CheckboxInput, self).__init__(attrs)
# check_test is a callable that takes a value and returns True
# if the checkbox should be checked for that value.
- self.attrs = attrs or {}
self.check_test = check_test
def render(self, name, value, attrs=None):
@@ -172,7 +172,7 @@ def render(self, name, value, attrs=None):
class Select(Widget):
def __init__(self, attrs=None, choices=()):
- self.attrs = attrs or {}
+ super(Select, self).__init__(attrs)
# choices can be any iterable, but we may need to render this widget
# multiple times. Thus, collapse it into a list so it can be consumed
# more than once.
@@ -211,8 +211,8 @@ def value_from_datadict(self, data, files, name):
class SelectMultiple(Widget):
def __init__(self, attrs=None, choices=()):
+ super(SelectMultiple, self).__init__(attrs)
# choices can be any iterable
- self.attrs = attrs or {}
self.choices = choices
def render(self, name, value, attrs=None, choices=()):
Please sign in to comment.
Something went wrong with that request. Please try again.