mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-22 20:55:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refs #15667 -- Removed choices argument from some RendererMixin methods.

Browse source 
RendererMixin will soon be removed but this removal and the corresponding
test changes stand on their own.
This commit is contained in:
Tim Graham 2016-04-28 18:48:52 -04:00
parent f951bb78cb
commit 86573861a9
4 changed files with 53 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
django/forms/widgets.py
View file

@ -753,20 +753,19 @@ class RendererMixin(object):
self.renderer = renderer
super(RendererMixin, self).__init__(*args, **kwargs)
def subwidgets(self, name, value, attrs=None, choices=()):
for widget in self.get_renderer(name, value, attrs, choices):
def subwidgets(self, name, value, attrs=None):
for widget in self.get_renderer(name, value, attrs):
yield widget
def get_renderer(self, name, value, attrs=None, choices=()):
def get_renderer(self, name, value, attrs=None):
"""Returns an instance of the renderer."""
if value is None:
value = self._empty_value
final_attrs = self.build_attrs(attrs)
choices = list(chain(self.choices, choices))
return self.renderer(name, value, final_attrs, choices)
return self.renderer(name, value, final_attrs, self.choices)
def render(self, name, value, attrs=None, choices=()):
return self.get_renderer(name, value, attrs, choices).render()
def render(self, name, value, attrs=None):
return self.get_renderer(name, value, attrs).render()
def id_for_label(self, id_):
# Widgets using this RendererMixin are made of a collection of