From 2bd152b46f608933a8c4c6a3c2689781fc58f4fd Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 20 Mar 2017 09:42:59 -0400 Subject: [1.11.x] Refs #27919 -- Changed Widget.get_context() attrs kwarg to an arg. Backport of 075e93c16a82ba7869a0b2d572e99fdbd0724042 and 93d07701045c242f81396016ab4ae15ba63a55d9 from master --- django/forms/widgets.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'django/forms') diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 90ff7bff55..686c092795 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -201,7 +201,7 @@ class Widget(six.with_metaclass(RenameWidgetMethods)): return formats.localize_input(value) return force_text(value) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = {} context['widget'] = { 'name': name, @@ -271,7 +271,7 @@ class Input(Widget): self.input_type = attrs.pop('type', self.input_type) super(Input, self).__init__(attrs) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(Input, self).get_context(name, value, attrs) context['widget']['type'] = self.input_type return context @@ -323,7 +323,7 @@ class MultipleHiddenInput(HiddenInput): """ template_name = 'django/forms/widgets/multiple_hidden.html' - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(MultipleHiddenInput, self).get_context(name, value, attrs) final_attrs = context['widget']['attrs'] id_ = context['widget']['attrs'].get('id') @@ -405,7 +405,7 @@ class ClearableFileInput(FileInput): if self.is_initial(value): return value - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ClearableFileInput, self).get_context(name, value, attrs) checkbox_name = self.clear_checkbox_name(name) checkbox_id = self.clear_checkbox_id(checkbox_name) @@ -502,7 +502,7 @@ class CheckboxInput(Input): return return force_text(value) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): if self.check_test(value): if attrs is None: attrs = {} @@ -622,7 +622,7 @@ class ChoiceWidget(Widget): 'template_name': self.option_template_name, } - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ChoiceWidget, self).get_context(name, value, attrs) context['widget']['optgroups'] = self.optgroups(name, context['widget']['value'], attrs) context['wrap_label'] = True @@ -667,7 +667,7 @@ class Select(ChoiceWidget): checked_attribute = {'selected': True} option_inherits_attrs = False - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(Select, self).get_context(name, value, attrs) if self.allow_multiple_selected: context['widget']['attrs']['multiple'] = 'multiple' @@ -789,7 +789,7 @@ class MultiWidget(Widget): def is_hidden(self): return all(w.is_hidden for w in self.widgets) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(MultiWidget, self).get_context(name, value, attrs) if self.is_localized: for widget in self.widgets: @@ -941,7 +941,7 @@ class SelectDateWidget(Widget): self.month_none_value = self.none_value self.day_none_value = self.none_value - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(SelectDateWidget, self).get_context(name, value, attrs) date_context = {} year_choices = [(i, i) for i in self.years] -- cgit v1.3