diff options
| author | Rob Hudson | 2013-01-09 08:57:05 -0800 |
|---|---|---|
| committer | Rob Hudson | 2013-01-09 08:57:05 -0800 |
| commit | 21d162c3232a8b49c053e06c3cc27b17776d8ccb (patch) | |
| tree | 21d68d802dbd1bdb1c1800544091b8adc6bb3bef /debug_toolbar | |
| parent | 3b284755fe9c2f9a714659f6f2e25a8eea1dd3df (diff) | |
| parent | 39088e7cabfba63201ac4b1e27b8410d455ccc46 (diff) | |
| download | django-debug-toolbar-21d162c3232a8b49c053e06c3cc27b17776d8ccb.tar.bz2 | |
Merge pull request #349 from charettes/django-1.5-compat
Avoid importing `django.conf.urls.defaults` on django 1.4+
Diffstat (limited to 'debug_toolbar')
| -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 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__' |