Ticket #15127: choicefield-deepcopy-v1.diff

django/forms/fields.py

@@ -695 +695 @@
                     return True
         return False
 
+    def __deepcopy__(self, memo):
+        result = super(ChoiceField, self).__deepcopy__(memo)
+        result._choices = copy.copy(self._choices)
+        return result
+
+
 class TypedChoiceField(ChoiceField):
     def __init__(self, *args, **kwargs):
         self.coerce = kwargs.pop('coerce', lambda val: val)

tests/regressiontests/forms/tests/forms.py

@@ -771 +771 @@
         f = Person(name_max_length=None)
         self.assertEqual(f['first_name'].field.max_length, f['last_name'].field.max_length, (30, 30))
 
+        class Person(Form):
+            first_name = CharField(required=False)
+            last_name = CharField(required=False)
+            gender = ChoiceField(choices=(('f', 'Female'), ('m', 'Male')))
+
+            def __init__(self, allow_unspec_gender=False, *args, **kwargs):
+                super(Person, self).__init__(*args, **kwargs)
+
+                if allow_unspec_gender:
+                    self.fields['gender'].choices += (('u', 'Unspecified'),)
+
+        f = Person()
+        self.assertEqual(len(f['gender'].field.choices), 2)
+        f = Person(allow_unspec_gender=True)
+        self.assertEqual(len(f['gender'].field.choices), 3)
+        self.assertEqual(f['gender'].field.choices[2], ('u', 'Unspecified'))
+        f = Person()
+        self.assertEqual(len(f['gender'].field.choices), 2)
+
+
+
     def test_hidden_widget(self):
         # HiddenInput widgets are displayed differently in the as_table(), as_ul())
         # and as_p() output of a Form -- their verbose names are not displayed, and a