Merge pull request #62 from vparitskiy/master

Prepare for deprecation of django.utils.importlib in Django 1.9
paulocheque · May 22, 2015 · fe188ee · fe188ee
2 parents f5f7207 + 0ce4bf5
commit fe188ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/django_dynamic_fixture/ddf.py b/django_dynamic_fixture/ddf.py
@@ -7,7 +7,11 @@
 
 from django.core.files import File
 from django.db.models import Field
-from django.utils.importlib import import_module
+
+try:
+    from importlib import import_module
+except ImportError:
+    from django.utils.importlib import import_module
 
 from django_dynamic_fixture.django_helper import get_related_model, \
     field_has_choices, field_has_default_value, get_fields_from_model, \

diff --git a/django_dynamic_fixture/global_settings.py b/django_dynamic_fixture/global_settings.py
@@ -8,7 +8,10 @@
 
 from django.conf import settings
 from django.core.urlresolvers import get_mod_func
-from django.utils.importlib import import_module
+try:
+    from importlib import import_module
+except ImportError:
+    from django.utils.importlib import import_module
 import six
 
 from django_dynamic_fixture.fixture_algorithms.sequential_fixture import SequentialDataFixture, StaticSequentialDataFixture, GlobalSequentialDataFixture