From 49238b28ae0519a0268b2b45fc77674e44847bf9 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 5 Dec 2012 16:06:12 -0800 Subject: [PATCH] Fix django.conf.urls.defaults deprecation warning in admin (Test on Django 1.3, 1.4, 1.5b) --- djrill/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/djrill/__init__.py b/djrill/__init__.py index 7fb4430..97158cb 100644 --- a/djrill/__init__.py +++ b/djrill/__init__.py @@ -27,7 +27,11 @@ class DjrillAdminSite(AdminSite): def get_urls(self): """Add our custom views to the admin urlconf.""" 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: urls += patterns('', url(r'^%s$' % path, self.admin_view(view), name=name),