Ticket #12667: 12667.2.diff

django/db/models/fields/__init__.py

@@ -1 +1 @@
 import datetime
 import decimal
-import os
 import re
 import time
 
 import django.utils.copycompat as copy
 
 from django.db import connection
-from django.db.models import signals
 from django.db.models.fields.subclassing import LegacyConnection
 from django.db.models.query_utils import QueryWrapper
-from django.dispatch import dispatcher
 from django.conf import settings
 from django import forms
 from django.core import exceptions, validators
@@ -18 +15 @@
 from django.utils.functional import curry
 from django.utils.itercompat import tee
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode, force_unicode, smart_str
 from django.utils import datetime_safe
 
@@ -198 +195 @@
             # Skip validation for non-editable fields.
             return
         if self._choices and value:
-            if not value in dict(self.choices):
+            found = False
+            for k, v in self.choices:
+                if type(v) in (tuple, list):
+                    # This is an optgroup, so look inside the group for options
+                    for k2, v2 in v:
+                        if value == k2:
+                            found = True
+                            break
+                    if found:
+                        break
+                elif value == k:
+                    found = True
+                    break
+            if not found:
                 raise exceptions.ValidationError(self.error_messages['invalid_choice'] % value)
 
         if value is None and not self.null:
@@ -567 +577 @@
 
     def get_prep_value(self, value):
         return self.to_python(value)
-    
+
     def formfield(self, **kwargs):
         # Passing max_length to forms.CharField means that the value's length
         # will be validated twice. This is considered acceptable since we want

tests/regressiontests/model_fields/tests.py

@@ -173 +173 @@
         f = models.CharField(choices=[('a','A'), ('b','B')])
         self.assertRaises(ValidationError, f.clean, "not a", None)
 
+    def test_choices_validation_supports_named_groups(self):
+       f = models.IntegerField(choices=(('group',((10,'A'),(20,'B'))),(30,'C')))
+       self.assertEqual(10, f.clean(10, None))
+
     def test_nullable_integerfield_raises_error_with_blank_false(self):
         f = models.IntegerField(null=True, blank=False)
         self.assertRaises(ValidationError, f.clean, None, None)
@@ -202 +206 @@
 class BigIntegerFieldTests(django.test.TestCase):
     def test_limits(self):
         # Ensure that values that are right at the limits can be saved
-        # and then retrieved without corruption. 
+        # and then retrieved without corruption.
         maxval = 9223372036854775807
         minval = -maxval - 1
         BigInt.objects.create(value=maxval)
@@ -236 +240 @@
     """
     def test_lookup_integer_in_charfield(self):
         self.assertEquals(Post.objects.filter(title=9).count(), 0)
-        
+
     def test_lookup_integer_in_textfield(self):
         self.assertEquals(Post.objects.filter(body=24).count(), 0)
-        
+