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'