Fix for callable enum field default

Author: gsakkis

enumfields/fields.py

@@ -76,16 +76,10 @@ def value_to_string(self, obj):
         return str(value.value) if value is not None else ''
 
     def get_default(self):
-        if self.has_default():
-            if self.default is None:
-                return None
-
-            if isinstance(self.default, Enum):
-                return self.default
-
-            return self.enum(self.default)
-
-        return super().get_default()
+        default = super().get_default()
+        if default is not None and self.has_default():
+            default = self.enum(default)
+        return default
 
     def deconstruct(self):
         name, path, args, kwargs = super().deconstruct()

tests/models.py

@@ -12,6 +12,8 @@ class MyModel(models.Model):
     taste = EnumField(Taste, default=Taste.SWEET)
     taste_not_editable = EnumField(Taste, default=Taste.SWEET, editable=False)
     taste_null_default = EnumField(Taste, null=True, blank=True, default=None)
+    taste_callable_enum_default = EnumField(Taste, default=lambda: Taste.SWEET, editable=False)
+    taste_callable_value_default = EnumField(Taste, default=lambda: Taste.SWEET.value, editable=False)
     taste_int = EnumIntegerField(Taste, default=Taste.SWEET)
 
     default_none = EnumIntegerField(Taste, default=None, null=True, blank=True)