Ticket #4787: ModelChoiceField_widget_choices.patch

newforms/models.py

@@ -142 +142 @@
-        Field.__init__(self, required, widget, label, initial, help_text)
-        self.widget.choices = self.choices
-
+    def _get_queryset(self):
+        return self._queryset
+
+    def _set_queryset(self, value):
+        self._queryset = value
+        self.widget.choices = self.choices
+
+    queryset = property(_get_queryset, _set_queryset)
+
-    def _get_choices(self):
-        # If self._choices is set, then somebody must have manually set
-        # the property self.choices. In this case, just return self._choices.