Ticket #11644: fields.py.diff

fields.py

@@ -634 +634 @@
     def _get_choices(self):
         return self._choices
 
-    def _set_choices(self, value):
+    def _set_choices(self, choices):
         # Setting choices also sets the choices on the widget.
         # choices can be any iterable, but we call list() on it because
         # it will be consumed more than once.
-        self._choices = self.widget.choices = list(value)
+        self._choices = self.widget.choices = [choice if isinstance(choice, tuple) else (choice, choice) for choice in choices]
 
     choices = property(_get_choices, _set_choices)