Merge pull request #43 from suriya/develop

Fix DeprecationWarning when importing GenericForeignKey
klen · Aug 12, 2015 · 1f1784a · 1f1784a
2 parents 66d03eb + 58dc709
commit 1f1784a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mixer/backend/django.py b/mixer/backend/django.py
@@ -7,8 +7,12 @@
 
 import decimal
 from django import VERSION
-from django.contrib.contenttypes.generic import (
-    GenericForeignKey, GenericRelation)
+if VERSION < (1, 8):
+    from django.contrib.contenttypes.generic import (
+        GenericForeignKey, GenericRelation)
+else:
+    from django.contrib.contenttypes.generic.fields import (
+        GenericForeignKey, GenericRelation)
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.base import ContentFile
 from django.core.validators import (