Revert "Refs #31262 -- Delegated RelatedFieldWidgetWrapper._choices h…

…andling to wrapped widget." This reverts commit 54f4eb603d148263ea66856174b6530d11937da5.
django · Jul 21, 2023 · 9cc003f · 9cc003f
1 parent 9b70683
commit 9cc003f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
@@ -302,14 +302,6 @@ def choices(self):
     def choices(self, value):
         self.widget.choices = value
 
-    @property
-    def _choices(self):
-        return self.widget._choices
-
-    @_choices.setter
-    def _choices(self, value):
-        self.widget._choices = value
-
     def get_related_url(self, info, action, *args):
         return reverse(
             "admin:%s_%s_%s" % (info + (action,)),

diff --git a/django/forms/fields.py b/django/forms/fields.py
@@ -885,8 +885,8 @@ def choices(self):
     @choices.setter
     def choices(self, value):
         # Setting choices on the field also sets the choices on the widget.
-        # Note that we bypass the property setter to avoid re-normalizing.
-        self._choices = self.widget._choices = normalize_field_choices(value)
+        # Note that the property setter for the widget will re-normalize.
+        self._choices = self.widget.choices = normalize_field_choices(value)
 
     def to_python(self, value):
         """Return a string."""