From cbc27663a347fdba5c4d5ae3be52536701cf291c Mon Sep 17 00:00:00 2001 From: ILYA Date: Wed, 25 Feb 2015 19:38:29 +0300 Subject: [PATCH] Refactored import from generic module to get rid of DeprecationWarning --- adminsortable/admin.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adminsortable/admin.py b/adminsortable/admin.py index b105ca4..6205364 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -1,8 +1,6 @@ import json from django import VERSION -from django.contrib.contenttypes.generic import (GenericStackedInline, - GenericTabularInline) from django.conf import settings @@ -16,6 +14,11 @@ from django.contrib.admin.options import InlineModelAdmin if VERSION >= (1, 8): from django.contrib.auth import get_permission_codename + from django.contrib.contenttypes.admin import (GenericStackedInline, + GenericTabularInline) +else: + from django.contrib.contenttypes.generic import (GenericStackedInline, + GenericTabularInline) from django.contrib.contenttypes.models import ContentType from django.http import HttpResponse