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

RendererMixin will soon be removed but this removal and the corresponding
test changes stand on their own.

1 files changed, 6 insertions, 7 deletions

diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 68abd3b7dc..ab9794a1e7 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -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