summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2012-02-05 08:09:26 +0000
committerJulien Phalip <jphalip@gmail.com>2012-02-05 08:09:26 +0000
commit1cd18f4cfdaf5f4a4002e9c59e1146e5fa0d70d3 (patch)
treeddc60d2795d827087d4f6b753df536d6a4872e14
parentad8ebb7006be7d93f1c6a29770dbca2752488a62 (diff)
Fixed #17493 -- Made `Widget.id_for_label()` consistently be an instance method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/forms/extras/widgets.py1
-rw-r--r--django/forms/widgets.py4
2 files changed, 0 insertions, 5 deletions
diff --git a/django/forms/extras/widgets.py b/django/forms/extras/widgets.py
index 65d6bf15f5..0a2223bc3f 100644
--- a/django/forms/extras/widgets.py
+++ b/django/forms/extras/widgets.py
@@ -101,7 +101,6 @@ class SelectDateWidget(Widget):
return '%s_%s' % (id_, first_select)
else:
return '%s_month' % id_
- id_for_label = classmethod(id_for_label)
def value_from_datadict(self, data, files, name):
y = data.get(self.year_field % name)
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 49b148eeca..1fbef98deb 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -234,7 +234,6 @@ class Widget(object):
tags.
"""
return id_
- id_for_label = classmethod(id_for_label)
class Input(Widget):
"""
@@ -735,7 +734,6 @@ class RadioSelect(Select):
if id_:
id_ += '_0'
return id_
- id_for_label = classmethod(id_for_label)
class CheckboxSelectMultiple(SelectMultiple):
def render(self, name, value, attrs=None, choices=()):
@@ -767,7 +765,6 @@ class CheckboxSelectMultiple(SelectMultiple):
if id_:
id_ += '_0'
return id_
- id_for_label = classmethod(id_for_label)
class MultiWidget(Widget):
"""
@@ -826,7 +823,6 @@ class MultiWidget(Widget):
if id_:
id_ += '_0'
return id_
- id_for_label = classmethod(id_for_label)
def value_from_datadict(self, data, files, name):
return [widget.value_from_datadict(data, files, name + '_%s' % i) for i, widget in enumerate(self.widgets)]