diff options
| author | Simon Charette | 2012-12-30 02:22:44 -0500 | 
|---|---|---|
| committer | Simon Charette | 2012-12-30 02:36:06 -0500 | 
| commit | 39088e7cabfba63201ac4b1e27b8410d455ccc46 (patch) | |
| tree | 8a1460aface3df1e1a26e94703613f85a5f6319f /tests | |
| parent | 22ebebd29b5d42ae50e9681847784713fa67daf5 (diff) | |
| download | django-debug-toolbar-39088e7cabfba63201ac4b1e27b8410d455ccc46.tar.bz2 | |
Avoid importing `django.conf.urls.defaults` on django 1.4+
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/urls.py | 7 | 
1 files changed, 5 insertions, 2 deletions
| 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'), | 
