Fix get_prep_value to raise ValidationError instead of ValueError

enumfields/fields.py

@@ -66,7 +66,7 @@ def get_prep_value(self, value):
             return None
         if isinstance(value, self.enum):  # Already the correct type -- fast path
             return value.value
-        return self.enum(value).value
+        return self.to_python(value).value
 
     def from_db_value(self, value, expression, connection, *args):
         return self.to_python(value)
@@ -154,15 +154,3 @@ def validators(self):
         # connection.ops.integer_field_range method.
         next = super(models.IntegerField, self)
         return next.validators
-
-    def get_prep_value(self, value):
-        if value is None:
-            return None
-
-        if isinstance(value, Enum):
-            return value.value
-
-        try:
-            return int(value)
-        except ValueError:
-            return self.to_python(value).value

tests/test_django_models.py

@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.db import connection
 
 import pytest
@@ -20,7 +21,7 @@ def test_field_value():
     m = MyModel.objects.filter(color='r')[0]
     assert m.color == Color.RED
 
-    with pytest.raises(ValueError):
+    with pytest.raises(ValidationError):
         MyModel.objects.filter(color='xx')[0]