Skip to content

Commit

Permalink
Merge pull request #388 from blag/master
Browse files Browse the repository at this point in the history
Fix Django 1.8+ warnings by importing from django.contrib.admin.utils (plural)
  • Loading branch information
etianen committed Apr 13, 2015
2 parents 8b17b37 + 78d9067 commit 13c7b5f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/reversion/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
from django.conf.urls import patterns, url
from django.contrib import admin
from django.contrib.admin import helpers, options
from django.contrib.admin.util import unquote, quote
try:
from django.contrib.admin.utils import unquote, quote
except ImportError: # Django < 1.7
from django.contrib.admin.util import unquote, quote
from django.contrib.contenttypes.generic import GenericInlineModelAdmin, GenericRelation
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse
Expand Down

0 comments on commit 13c7b5f

Please sign in to comment.