Merge pull request #90 from Viralize/fix_88

FIX #88: Use DDF_IGNORE_FIELDS globally for all new instances
paulocheque · Aug 7, 2017 · 1a93ba5 · 1a93ba5
2 parents 3f0c879 + f231d94
commit 1a93ba5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/django_dynamic_fixture/__init__.py b/django_dynamic_fixture/__init__.py
@@ -48,7 +48,6 @@ def fixture(**kwargs):
                        print_errors=kwargs.pop('print_errors', True),
                        debug_mode=kwargs.pop('debug_mode', DDF_DEBUG_MODE),
                        **kwargs)
-    f.ignore_fields.extend(DDF_IGNORE_FIELDS)
     return f
 
 

diff --git a/django_dynamic_fixture/ddf.py b/django_dynamic_fixture/ddf.py
@@ -229,10 +229,14 @@ def __init__(self, data_fixture, fill_nullable_fields=True, ignore_fields=[], nu
         :print_errors: flag to determine if the model data must be printed to console on errors. For some scripts is interesting to disable it.
         :model_path: internal variable used to control the cycles of dependencies.
         """
+        from django_dynamic_fixture.global_settings import DDF_IGNORE_FIELDS
+
         # custom config of fixtures
         self.data_fixture = data_fixture
         self.fill_nullable_fields = fill_nullable_fields
         self.ignore_fields = ignore_fields
+        # extend ignore_fields with globally declared ignore_fields
+        self.ignore_fields.extend(DDF_IGNORE_FIELDS)
         self.number_of_laps = number_of_laps
         self.use_library = use_library
         # other ddfs configs
@@ -387,9 +391,12 @@ def set_data_for_a_field(self, model_class, __instance, __field, persist_depende
                 LOGGER.debug('%s.%s = %s' % (get_unique_model_name(model_class), __field.name, data))
             try:
                 setattr(__instance, __field.name, data) # Model.field = data
-            except ValueError as e:
+            except (ValueError, AttributeError) as e:
                 if is_relationship_field(__field):
-                    setattr(__instance, "%s_id" % __field.name, data) # Model.field = data
+                    # Handle AttributeError for compatibility with django-polymorphic
+                    # https://github.com/paulocheque/django-dynamic-fixture/issues/88
+                    field_value = data.id if isinstance(e, AttributeError) else data
+                    setattr(__instance, "%s_id" % __field.name, field_value) # Model.field = data
                 else:
                     six.reraise(*sys.exc_info())
         self.fields_processed.append(__field.name)