diff options
| author | Vladislav Poluhin | 2013-04-24 15:54:17 +0800 |
|---|---|---|
| committer | Vladislav Poluhin | 2013-04-24 15:54:17 +0800 |
| commit | 4c1c4f7a8873a80f843ba683240b9d0ff0f49e4b (patch) | |
| tree | 4840de7ec2ec41d1ef7cc362803c2d0ace58d663 /debug_toolbar/urls.py | |
| parent | 3d0467d9a4394c4b994a802e6e861ff2562dbb2b (diff) | |
| parent | 6f79f0b0ada69e1d95d97066ba78e0d18aeab3ba (diff) | |
| download | django-debug-toolbar-4c1c4f7a8873a80f843ba683240b9d0ff0f49e4b.tar.bz2 | |
Merge branch 'master' of https://github.com/django-debug-toolbar/django-debug-toolbar into sql-panel-refactor
Conflicts:
debug_toolbar/static/debug_toolbar/css/toolbar.min.css
debug_toolbar/views.py
Diffstat (limited to 'debug_toolbar/urls.py')
| -rw-r--r-- | debug_toolbar/urls.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py index 60d6424..b37bf2d 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__' |