Merge pull request #70 from lucaswiman/allow-passing-enum-objects-as-data

Allow passing enum objects as data to form

Author: akx

enumfields/forms.py

@@ -1,8 +1,12 @@
 # -- encoding: UTF-8 --
+from __future__ import absolute_import
+
 from django.forms import TypedChoiceField
 from django.forms.fields import TypedMultipleChoiceField
 from django.utils.encoding import force_text
 
+from .enums import Enum
+
 __all__ = ["EnumChoiceField", "EnumMultipleChoiceField"]
 
 
@@ -22,6 +26,11 @@ def valid_value(self, value):
                 return True
         return super(EnumChoiceFieldMixin, self).valid_value(value)
 
+    def to_python(self, value):
+        if isinstance(value, Enum):
+            value = value.value
+        return super(EnumChoiceFieldMixin, self).to_python(value)
+
 
 class EnumChoiceField(EnumChoiceFieldMixin, TypedChoiceField):
     pass

tests/test_form_fields.py

@@ -2,9 +2,9 @@
 import pytest
 import six
 from django.db.models import BLANK_CHOICE_DASH
-from django.forms.models import modelform_factory
+from django.forms.models import modelform_factory, model_to_dict
 
-from .enums import Color
+from .enums import Color, ZeroEnum
 from .models import MyModel
 
 
@@ -30,3 +30,13 @@ def test_choices():
     form = get_form()
     assert form.base_fields["zero2"].choices == [(0, 'Zero'), (1, 'One')]
     assert form.base_fields["int_enum"].choices == BLANK_CHOICE_DASH + [(0, 'foo'), (1, 'B')]
+
+
+def test_validation():
+    form = get_form(data={"color": Color.GREEN, "zero2": ZeroEnum.ZERO})
+    assert form.is_valid(), form.errors
+
+    instance = MyModel(color=Color.RED, zero2=ZeroEnum.ZERO)
+    data = model_to_dict(instance, fields=("color", "zero2", "int_enum"))
+    form = get_form(data=data)
+    assert form.is_valid(), form.errors