Ticket #9209: django-modelchoicefields-invalid-value.patch

django/forms/models.py

@@ -920 +920 @@
     default_error_messages = {
         'invalid_choice': _(u'Select a valid choice. That choice is not one of'
                             u' the available choices.'),
+        'invalid_pk_value': _(u'"%s" is not a valid value for a primary key.')
     }
 
     def __init__(self, queryset, empty_label=u"---------", cache_choices=False,
@@ -984 +985 @@
     def to_python(self, value):
         if value in EMPTY_VALUES:
             return None
+        opts = self.queryset.model._meta
+        # can raise FieldDoesNotExist which is a programming error so we don't catch it
+        field = self.to_field_name and opts.get_field(self.to_field_name) or opts.pk
         try:
-            key = self.to_field_name or 'pk'
-            value = self.queryset.get(**{key: value})
+            value = field.to_python(value)
+        except ValidationError:
+            raise ValidationError(self.error_messages['invalid_pk_value'] % value)
+        try:
+            value = self.queryset.get(**{field.name: value})
         except self.queryset.model.DoesNotExist:
             raise ValidationError(self.error_messages['invalid_choice'])
         return value
@@ -1019 +1026 @@
             return []
         if not isinstance(value, (list, tuple)):
             raise ValidationError(self.error_messages['list'])
+        field = self.queryset.model._meta.pk
         for pk in value:
             try:
-                self.queryset.filter(pk=pk)
-            except ValueError:
+                field.to_python(pk)
+            except ValidationError:
                 raise ValidationError(self.error_messages['invalid_pk_value'] % pk)
         qs = self.queryset.filter(pk__in=value)
         pks = set([force_unicode(o.pk) for o in qs])

tests/modeltests/model_forms/models.py

@@ -860 +860 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+>>> f.clean('fail')
+Traceback (most recent call last):
+...
+ValidationError: [u'"fail" is not a valid value for a primary key.']
 >>> f.clean(3)
 <Category: Third>
 >>> f.clean(2)