Skip to content
This repository has been archived by the owner on Aug 23, 2020. It is now read-only.

Commit

Permalink
Merge pull request #46 from lambdalisue/fix/django_18_deprecated
Browse files Browse the repository at this point in the history
Fix Django 1.8: django.contrib.admin.util is deprecated issue #45
  • Loading branch information
lambdalisue committed Aug 1, 2015
2 parents 95d3018 + 9d9e43d commit c0aee3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/registration/admin/__init__.py
Expand Up @@ -48,7 +48,6 @@
from django.db import transaction
from django.http import HttpResponseRedirect
from django.contrib import admin
from django.contrib.admin.util import unquote
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.core.exceptions import ImproperlyConfigured
Expand All @@ -65,6 +64,7 @@
from registration.compat import import_module
from registration.compat import force_unicode
from registration.compat import transaction_atomic
from registration.compat import unquote


csrf_protect_m = method_decorator(csrf_protect)
Expand Down
5 changes: 5 additions & 0 deletions src/registration/compat.py
Expand Up @@ -22,6 +22,11 @@
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import include

try:
from django.contrib.admin.utils import unquote
except ImportError:
from django.contrib.admin.util import unquote

# Python 2.7 has an importlib with import_module; for older Pythons,
# Django's bundled copy provides it.
try:
Expand Down

0 comments on commit c0aee3d

Please sign in to comment.