Fixed #36201 -- Fixed ModelChoiceField/ModelMultipleChoiceField.clean() to catch ValidationError from queryset operations.

Author: timgraham

django/forms/models.py

@@ -1562,7 +1562,12 @@ def to_python(self, value):
             if isinstance(value, self.queryset.model):
                 value = getattr(value, key)
             value = self.queryset.get(**{key: value})
-        except (ValueError, TypeError, self.queryset.model.DoesNotExist):
+        except (
+            ValueError,
+            TypeError,
+            ValidationError,
+            self.queryset.model.DoesNotExist,
+        ):
             raise ValidationError(
                 self.error_messages["invalid_choice"],
                 code="invalid_choice",
@@ -1640,7 +1645,7 @@ def _check_values(self, value):
             self.validate_no_null_characters(pk)
             try:
                 self.queryset.filter(**{key: pk})
-            except (ValueError, TypeError):
+            except (ValueError, TypeError, ValidationError):
                 raise ValidationError(
                     self.error_messages["invalid_pk_value"],
                     code="invalid_pk_value",

tests/model_forms/test_uuid.py

@@ -30,6 +30,6 @@ def test_update_save_error(self):
     def test_model_multiple_choice_field_uuid_pk(self):
         f = forms.ModelMultipleChoiceField(UUIDPK.objects.all())
         with self.assertRaisesMessage(
-            ValidationError, "“invalid_uuid” is not a valid UUID."
+            ValidationError, "“invalid_uuid” is not a valid value."
         ):
             f.clean(["invalid_uuid"])