Merge pull request #219 from aericson/deprecation-19

Address deprecations warnings from RemovedInDjango19Warning

model_mommy/mommy.py

@@ -2,15 +2,18 @@
 import warnings
 
 from django.conf import settings
-from django.utils import importlib
-from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 import django
-from django.db.models.loading import get_model
 if django.VERSION >= (1, 7):
+    import importlib
     from django.apps import apps
+    get_model = apps.get_model
+    from django.contrib.contenttypes.fields import GenericRelation
 else:
+    from django.db.models.loading import get_model
+    from django.utils import importlib
     from django.db.models.loading import cache
+    from django.contrib.contenttypes.generic import GenericRelation
 from django.db.models.base import ModelBase
 from django.db.models import (
     CharField, EmailField, SlugField, TextField, URLField,
@@ -292,7 +295,7 @@ def _make(self, commit=True, **attrs):
 
             field_value_not_defined = field.name not in model_attrs
 
-            if isinstance(field, (AutoField, generic.GenericRelation)):
+            if isinstance(field, (AutoField, GenericRelation)):
                 continue
 
             if all([field.name not in model_attrs, field.name not in self.rel_fields, field.name not in self.attr_mapping]):

test/generic/models.py

@@ -12,7 +12,11 @@
 from django.core.files.storage import FileSystemStorage
 
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+if VERSION >= (1, 7):
+    from django.contrib.contenttypes.fields import GenericRelation, GenericForeignKey
+else:
+    from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey
+
 from .fields import *
 from model_mommy.timezone import smart_datetime as datetime
 import datetime as base_datetime
@@ -138,11 +142,11 @@ class DummyEmailModel(models.Model):
 class DummyGenericForeignKeyModel(models.Model):
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
 
 
 class DummyGenericRelationModel(models.Model):
-    relation = generic.GenericRelation(DummyGenericForeignKeyModel)
+    relation = GenericRelation(DummyGenericForeignKeyModel)
 
 
 class DummyNullFieldsModel(models.Model):