diff --git a/AUTHORS b/AUTHORS index cb328d0..e88123d 100644 --- 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 index e528e41..3e28816 100644 --- 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):