p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27919 -- Changed Widget.get_context() attrs kwarg to an arg.

This commit is contained in:
Tim Graham 2017-03-20 09:42:59 -04:00
parent 6ff356e891
commit 075e93c16a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/forms/widgets.py
View File

@ -186,7 +186,7 @@ class Widget(metaclass=MediaDefiningClass):
return formats.localize_input(value) return formats.localize_input(value)
return force_text(value) return force_text(value)
def get_context(self, name, value, attrs=None): def get_context(self, name, value, attrs):
context = {} context = {}
context['widget'] = { context['widget'] = {
'name': name, 'name': name,
@ -254,7 +254,7 @@ class Input(Widget):
self.input_type = attrs.pop('type', self.input_type) self.input_type = attrs.pop('type', self.input_type)
super().__init__(attrs) super().__init__(attrs)
def get_context(self, name, value, attrs=None): def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
context['widget']['type'] = self.input_type context['widget']['type'] = self.input_type
return context return context
@ -306,7 +306,7 @@ class MultipleHiddenInput(HiddenInput):
""" """
template_name = 'django/forms/widgets/multiple_hidden.html' 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().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
final_attrs = context['widget']['attrs'] final_attrs = context['widget']['attrs']
id_ = context['widget']['attrs'].get('id') id_ = context['widget']['attrs'].get('id')
@ -388,7 +388,7 @@ class ClearableFileInput(FileInput):
if self.is_initial(value): if self.is_initial(value):
return value return value
def get_context(self, name, value, attrs=None): def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
checkbox_name = self.clear_checkbox_name(name) checkbox_name = self.clear_checkbox_name(name)
checkbox_id = self.clear_checkbox_id(checkbox_name) checkbox_id = self.clear_checkbox_id(checkbox_name)
@ -485,7 +485,7 @@ class CheckboxInput(Input):
return return
return force_text(value) 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 self.check_test(value):
if attrs is None: if attrs is None:
attrs = {} attrs = {}
@ -603,7 +603,7 @@ class ChoiceWidget(Widget):
'template_name': self.option_template_name, 'template_name': self.option_template_name,
} }
def get_context(self, name, value, attrs=None): def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
context['widget']['optgroups'] = self.optgroups(name, context['widget']['value'], attrs) context['widget']['optgroups'] = self.optgroups(name, context['widget']['value'], attrs)
context['wrap_label'] = True context['wrap_label'] = True
@ -648,7 +648,7 @@ class Select(ChoiceWidget):
checked_attribute = {'selected': True} checked_attribute = {'selected': True}
option_inherits_attrs = False option_inherits_attrs = False
def get_context(self, name, value, attrs=None): def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
if self.allow_multiple_selected: if self.allow_multiple_selected:
context['widget']['attrs']['multiple'] = 'multiple' context['widget']['attrs']['multiple'] = 'multiple'
@ -767,7 +767,7 @@ class MultiWidget(Widget):
def is_hidden(self): def is_hidden(self):
return all(w.is_hidden for w in self.widgets) 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().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
if self.is_localized: if self.is_localized:
for widget in self.widgets: for widget in self.widgets:
@ -928,7 +928,7 @@ class SelectDateWidget(Widget):
self.month_none_value = self.none_value self.month_none_value = self.none_value
self.day_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().get_context(name, value, attrs) context = super().get_context(name, value, attrs)
date_context = {} date_context = {}
year_choices = [(i, i) for i in self.years] year_choices = [(i, i) for i in self.years]

4
docs/ref/forms/widgets.txt
View File

@ -236,7 +236,7 @@ foundation for custom widgets.
isn't guaranteed to be valid input, therefore subclass implementations isn't guaranteed to be valid input, therefore subclass implementations
should program defensively. should program defensively.
.. method:: get_context(name, value, attrs=None) .. method:: get_context(name, value, attrs)
.. versionadded:: 1.11 .. versionadded:: 1.11
@ -377,7 +377,7 @@ foundation for custom widgets.
It provides some custom context: It provides some custom context:
.. method:: get_context(name, value, attrs=None) .. method:: get_context(name, value, attrs)
In addition to the ``'widget'`` key described in In addition to the ``'widget'`` key described in
:meth:`Widget.get_context`, ``MultiValueWidget`` adds a :meth:`Widget.get_context`, ``MultiValueWidget`` adds a