Merge pull request #892 from gregplaysguitar/master

update url namespace format. fixes #881

Author: matthiask

debug_toolbar/__init__.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
+import django
+
 __all__ = ['VERSION']
 
 
@@ -11,9 +13,14 @@
 
 
 # Code that discovers files or modules in INSTALLED_APPS imports this module.
-# Reference URLpatterns with a string to avoid the risk of circular imports.
-
-urls = 'debug_toolbar.toolbar', 'djdt', 'djdt'
-
+# URLpatterns were referenced with a string prior to 1.9 to avoid the risk of
+# circular imports
+
+if django.VERSION < (1, 9):
+    urls = 'debug_toolbar.toolbar', 'djdt', 'djdt'
+else:
+    from . import toolbar
+    toolbar.app_name = 'djdt'
+    urls = toolbar
 
 default_app_config = 'debug_toolbar.apps.DebugToolbarConfig'