From cdc25ac4747bf5a6cdc2e70461c2d43c54529d35 Mon Sep 17 00:00:00 2001 From: Niclas Olofsson Date: Sat, 26 Jul 2014 11:06:30 +0200 Subject: Fixed #22808 -- Made ModelMultipleChoiceField validation more robust to invalid data types.. Thanks Mattias Lindvall for the report and inital patch. --- django/forms/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/forms') diff --git a/django/forms/models.py b/django/forms/models.py index 5838ac1631..fb342b3316 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1179,7 +1179,7 @@ class ModelChoiceField(ChoiceField): try: key = self.to_field_name or 'pk' value = self.queryset.get(**{key: value}) - except (ValueError, self.queryset.model.DoesNotExist): + except (ValueError, TypeError, self.queryset.model.DoesNotExist): raise ValidationError(self.error_messages['invalid_choice'], code='invalid_choice') return value @@ -1227,7 +1227,7 @@ class ModelMultipleChoiceField(ModelChoiceField): for pk in value: try: self.queryset.filter(**{key: pk}) - except ValueError: + except (ValueError, TypeError): raise ValidationError( self.error_messages['invalid_pk_value'], code='invalid_pk_value', -- cgit v1.3