diff options
| -rw-r--r-- | debug_toolbar/urls.py | 5 | ||||
| -rw-r--r-- | tests/urls.py | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py index 1446d99..0053ae7 100644 --- a/debug_toolbar/urls.py +++ b/debug_toolbar/urls.py @@ -4,7 +4,10 @@ URLpatterns for the debug toolbar. These should not be loaded explicitly; the debug toolbar middleware will patch this into the urlconf for the request. """ -from django.conf.urls.defaults import * +try: + from django.conf.urls import patterns, url +except ImportError: # django < 1.4 + from django.conf.urls.defaults import patterns, url _PREFIX = '__debug__' diff --git a/tests/urls.py b/tests/urls.py index a556703..778f417 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -4,14 +4,17 @@ URLpatterns for the debug toolbar. These should not be loaded explicitly; the debug toolbar middleware will patch this into the urlconf for the request. """ -from django.conf.urls.defaults import * from django.contrib import admin +try: + from django.conf.urls import patterns, url +except ImportError: # django < 1.4 + from django.conf.urls.defaults import patterns, url admin.autodiscover() urlpatterns = patterns('', # This pattern should be last to ensure tests still work - url(r'^resolving1/(.+)/(.+)/$', 'tests.views.resolving_view', name = 'positional-resolving'), + url(r'^resolving1/(.+)/(.+)/$', 'tests.views.resolving_view', name='positional-resolving'), url(r'^resolving2/(?P<arg1>.+)/(?P<arg2>.+)/$', 'tests.views.resolving_view'), url(r'^resolving3/(.+)/$', 'tests.views.resolving_view', { 'arg2' : 'default' }), url(r'^execute_sql/$', 'tests.views.execute_sql'), |