Merge pull request #10 from melvinkcx/fix_#9

Fixed #9
melvinkcx · Mar 7, 2020 · 81ee785 · 81ee785
2 parents 974b507 + dfc3a3c
commit 81ee785
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/model_field_meta/fields.py b/model_field_meta/fields.py
@@ -1,9 +1,14 @@
 class FieldWithMeta:
-    def __init__(self, **kwargs):
-        if 'meta' in kwargs:
-            self._meta = kwargs['meta']
-            del kwargs["meta"]
-        super(self.__class__, self).__init__(**kwargs)
+    @staticmethod
+    def generate___init__(base_class):
+        # Fix #9: Support custom field
+        def __init__(self, **kwargs):
+            if 'meta' in kwargs:
+                self._meta = kwargs['meta']
+                del kwargs["meta"]
+            super(base_class, self).__init__(**kwargs)
+
+        return __init__
 
     def get_meta(self):
         return self._meta

diff --git a/model_field_meta/wrapper.py b/model_field_meta/wrapper.py
@@ -15,7 +15,7 @@ def __init__(self):
             if field.endswith("Field") and field != "Field":
                 base_class = getattr(django_models, field)
                 self.new_classes[field] = type(field, (base_class,), {
-                    "__init__": FieldWithMeta.__init__,
+                    "__init__": FieldWithMeta.generate___init__(base_class),
                     "_meta": None,
                     "get_meta": FieldWithMeta.get_meta,
                     "deconstruct": FieldWithMeta.deconstruct,

diff --git a/tests/fields.py → tests/test_fields.py b/tests/fields.py → tests/test_fields.py
@@ -4,6 +4,12 @@
 
 
 class FieldMetaTestSuite(TestCase):
+    def test_custom_field_can_be_instantiated(self):
+        class CustomTextField(models.TextField):
+            pass
+
+        CustomTextField()
+
     def test_empty_meta(self):
         field = models.TextField()
         self.assertFalse(field.get_meta())

diff --git a/tests/migration_test.py → tests/test_migration.py b/tests/migration_test.py → tests/test_migration.py
diff --git a/tests/mixins.py → tests/test_mixins.py b/tests/mixins.py → tests/test_mixins.py