Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from a1tus/master 

Refactored import from generic module to get rid of DeprecationWarning in Django 1.8+
master
Brandon Taylor 2015-02-26 09:08:40 -05:00
parent 0af13803fb cbc27663a3
commit b8b644b77c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adminsortable/admin.py
View File

@ -1,8 +1,6 @@
import json import json
from django import VERSION from django import VERSION
from django.contrib.contenttypes.generic import (GenericStackedInline,
GenericTabularInline)
from django.conf import settings from django.conf import settings
@ -16,6 +14,11 @@ from django.contrib.admin.options import InlineModelAdmin
if VERSION >= (1, 8): if VERSION >= (1, 8):
from django.contrib.auth import get_permission_codename 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.contrib.contenttypes.models import ContentType
from django.http import HttpResponse from django.http import HttpResponse