pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-20 11:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix django.conf.urls.defaults deprecation warning in admin

Browse Source 
(Test on Django 1.3, 1.4, 1.5b)
This commit is contained in:
medmunds
2012-12-05 16:06:12 -08:00
parent 5f0ff0cba2
commit 49238b28ae
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
djrill/__init__.py
View File

@@ -27,7 +27,11 @@ class DjrillAdminSite(AdminSite):
def get_urls(self): def get_urls(self):
"""Add our custom views to the admin urlconf.""" """Add our custom views to the admin urlconf."""
urls = super(DjrillAdminSite, self).get_urls() urls = super(DjrillAdminSite, self).get_urls()
from django.conf.urls.defaults import patterns, url try:
from django.conf.urls import include, patterns, url
except ImportError:
# Django 1.3
from django.conf.urls.defaults import include, patterns, url
for path, view, name, display_name in self.custom_views: for path, view, name, display_name in self.custom_views:
urls += patterns('', urls += patterns('',
url(r'^%s$' % path, self.admin_view(view), name=name), url(r'^%s$' % path, self.admin_view(view), name=name),