Ticket #8746: 8746.diff

django/forms/models.py

@@ -729 +729 @@
         'list': _(u'Enter a list of values.'),
         'invalid_choice': _(u'Select a valid choice. %s is not one of the'
                             u' available choices.'),
+        'invalid_pk_value': _(u'"%s" is not a valid value for a primary key.')
     }
 
     def __init__(self, queryset, cache_choices=False, required=True,
@@ -751 +752 @@
                 obj = self.queryset.get(pk=val)
             except self.queryset.model.DoesNotExist:
                 raise ValidationError(self.error_messages['invalid_choice'] % val)
+            except ValueError:
+                raise ValidationError(self.error_messages['invalid_pk_value'] % val)
             else:
                 final_values.append(obj)
         return final_values

tests/modeltests/model_forms/models.py

@@ -857 +857 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'Enter a list of values.']
+>>> f.clean(['fail'])
+Traceback (most recent call last):
+...
+ValidationError: [u'"fail" is not a valid value for a primary key.']
 
 # Add a Category object *after* the ModelMultipleChoiceField has already been
 # instantiated. This proves clean() checks the database during clean() rather