Commit 1cd18f4c authored by Julien Phalip's avatar Julien Phalip
Browse files

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
parent ad8ebb70

django/forms/extras/widgets.py

+0 −1
Original line number Diff line number Diff line
@@ -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)

django/forms/widgets.py

+0 −4
Original line number Diff line number Diff line
@@ -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)]