Ticket #9209: 9209.diff

django/forms/models.py

@@ -708 +708 @@
         try:
             key = self.to_field_name or 'pk'
             value = self.queryset.get(**{key: value})
-        except self.queryset.model.DoesNotExist:
+        # Bare except since we could get ValueError, ValidationError, or ???
+        # if the form-supplied data is of the wrong type for the pk field
+        except:
             raise ValidationError(self.error_messages['invalid_choice'])
         return value
 
@@ -740 +742 @@
         for val in value:
             try:
                 obj = self.queryset.get(pk=val)
-            except self.queryset.model.DoesNotExist:
+            # Bare except since we could get ValueError, ValidationError, or ???
+            # if the form-supplied data is of the wrong type for the pk field
+            except:
                 raise ValidationError(self.error_messages['invalid_choice'] % val)
             else:
                 final_values.append(obj)

tests/regressiontests/forms/models.py

@@ -17 +17 @@
 class ChoiceModel(models.Model):
     """For ModelChoiceField and ModelMultipleChoiceField tests."""
     name = models.CharField(max_length=10)
+    
+class ChoiceModelCharPK(models.Model):
+    """For ModelChoiceField and ModelMultipleChoiceField tests."""
+    name = models.CharField(max_length=10, primary_key=True)
 
 class FileModel(models.Model):
     file = models.FileField(upload_to='/')

tests/regressiontests/forms/fields.py

@@ -1386 +1386 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'Enter a valid date.']
+
+# ModelChoiceFieldField & ModelMultipleChoiceField ###############################
+
+# Create choices for the model choice field tests below.
+>>> from regressiontests.forms.models import ChoiceModel
+>>> ChoiceModel.objects.create(name='x')
+<ChoiceModel: ChoiceModel object>
+
+>>> from regressiontests.forms.models import ChoiceModelCharPK
+>>> ChoiceModelCharPK.objects.create(name='x')
+<ChoiceModelCharPK: ChoiceModelCharPK object>
+
+# ModelChoiceField ############################################################
+
+>>> f = ModelChoiceField(queryset=ChoiceModel.objects.all())
+>>> pk = ChoiceModel.objects.all()[0].pk
+>>> f.clean(pk)
+<ChoiceModel: ChoiceModel object>
+>>> f.clean('NotAnInteger')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+
+>>> f = ModelChoiceField(queryset=ChoiceModelCharPK.objects.all())
+>>> pk = ChoiceModelCharPK.objects.all()[0].pk
+>>> f.clean(pk)
+<ChoiceModelCharPK: ChoiceModelCharPK object>
+>>> f.clean('Z')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+
+>>> f = ModelMultipleChoiceField(queryset=ChoiceModel.objects.all())
+>>> pk = ChoiceModel.objects.all()[0].pk
+>>> f.clean([pk])
+[<ChoiceModel: ChoiceModel object>]
+>>> f.clean(['NotAnInteger'])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. NotAnInteger is not one of the available choices.']
+
+>>> f = ModelMultipleChoiceField(queryset=ChoiceModelCharPK.objects.all())
+>>> pk = ChoiceModelCharPK.objects.all()[0].pk
+>>> f.clean([pk])
+[<ChoiceModelCharPK: ChoiceModelCharPK object>]
+>>> f.clean(['Z'])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. Z is not one of the available choices.']
 """