Added Django>=1.4 compatible django.conf.urls imports to prevent a de…

…precation warning. Fixes #25.
joshourisman · Jan 25, 2013 · 6ad38e9 · 6ad38e9
1 parent 700667c
commit 6ad38e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -14,3 +14,4 @@ Other contributions by
 - Brad Montgomery
 - Ryan Choi
 - Anna Callahan
+- Antti Kaihola
diff --git a/django_tablib/admin.py b/django_tablib/admin.py
@@ -27,7 +27,10 @@ def __init__(self, *args, **kwargs):
         super(TablibAdmin, self).__init__(*args, **kwargs)
 
     def get_urls(self):
-        from django.conf.urls.defaults import patterns, url
+        try:
+            from django.conf.urls import patterns, url
+        except ImportError:  # Django <1.4
+            from django.conf.urls.defaults import patterns, url
 
         def wrap(view):
             def wrapper(*args, **kwargs):