From cd9c9e10cb7130aed6d3203e17e8b542e90f50c7 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Sun, 14 Jul 2013 17:40:17 +0200
Subject: [PATCH] Update url configs.

django.conf.urls.defaults has been deprecated and now fully removed in 1.6.
---
 avatar/urls.py    | 6 +++++-
 tests/settings.py | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/avatar/urls.py b/avatar/urls.py
index 3635341..b2b6d49 100644
--- a/avatar/urls.py
+++ b/avatar/urls.py
@@ -1,4 +1,8 @@
-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
 
 urlpatterns = patterns(
     'avatar.views',
diff --git a/tests/settings.py b/tests/settings.py
index dbcd576..14adffc 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -1,4 +1,8 @@
-from django.conf.urls.defaults import patterns, include, handler500, handler404
+try:
+    from django.conf.urls import patterns, include, handler500, handler404
+except ImportError:
+    # Django < 1.4
+    from django.conf.urls.defaults import patterns, include, handler500, handler404
  
 DEFAULT_CHARSET = 'utf-8'