From 6ad38e94c8e64edcc18b7fbbb70454d585534ae6 Mon Sep 17 00:00:00 2001
From: Antti Kaihola <akaihol+github@ambitone.com>
Date: Fri, 25 Jan 2013 14:02:59 +0200
Subject: [PATCH] Added Django>=1.4 compatible django.conf.urls imports to
 prevent a deprecation warning. Fixes #25.

---
 AUTHORS                | 1 +
 django_tablib/admin.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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):