Ticket #14671: modelchoicefield_choices.diff

forms/models.py

@@ -22 +22 @@
 __all__ = (
     'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model',
     'save_instance', 'form_for_fields', 'ModelChoiceField',
-    'ModelMultipleChoiceField',
+    'ModelMultipleChoiceField', 'BaseModelFormSet', 'BaseInlineFormSet',
 )
 
 def construct_instance(form, instance, fields=None, exclude=None):
@@ -1004 +1004 @@
             return None
         try:
             key = self.to_field_name or 'pk'
-            value = self.queryset.get(**{key: value})
-        except (ValueError, self.queryset.model.DoesNotExist):
+            if hasattr(self, '_choices'):
+                # If self._choices is set, then it was set manually so we need to 
+                # check it rather than the queryset
+                assert smart_unicode(value) in [ smart_unicode(pk) for pk, label in self._choices ]
+                value = self.queryset.model.objects.get(**{key: value})
+            else:
+                value = self.queryset.get(**{key: value})
+        except (AssertionError, ValueError, self.queryset.model.DoesNotExist), e:
             raise ValidationError(self.error_messages['invalid_choice'])
         return value