Merge pull request #395 from BATCOH/patch-django19

Update admin.py to avoid RemovedInDjango19Warning
etianen · May 4, 2015 · 39f426d · 39f426d
2 parents 32d7f23 + 8621bbb
commit 39f426d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/reversion/admin.py b/src/reversion/admin.py
@@ -13,10 +13,11 @@
     from django.contrib.admin.utils import unquote, quote
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote, quote
-try:    
-    from django.contrib.contenttypes.generic import GenericInlineModelAdmin, GenericRelation
+try:
+    from django.contrib.contenttypes.admin import GenericInlineModelAdmin
+    from django.contrib.contenttypes.fields import GenericRelation
 except ImportError:  # Django < 1.9
-    from django.contrib.contenttypes.admin import GenericInlineModelAdmin, GenericRelation
+    from django.contrib.contenttypes.generic import GenericInlineModelAdmin, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.forms.formsets import all_valid