Fixed deprecation warning for django.conf.urls.default. (Deprecated in Django 1.4)
This commit is contained in:
parent
e5f531c0a5
commit
c37f27f2ba
|
@ -1,4 +1,7 @@
|
||||||
from django.conf.urls.defaults import patterns, url
|
try:
|
||||||
|
from django.conf.urls import patterns, url
|
||||||
|
except ImportError: # django < 1.4
|
||||||
|
from django.conf.urls.defaults import patterns, url
|
||||||
|
|
||||||
urlpatterns = patterns('admin_tools.dashboard.views',
|
urlpatterns = patterns('admin_tools.dashboard.views',
|
||||||
url(r'^set_preferences/(?P<dashboard_id>.+)/$', 'set_preferences', name='admin-tools-dashboard-set-preferences'),
|
url(r'^set_preferences/(?P<dashboard_id>.+)/$', 'set_preferences', name='admin-tools-dashboard-set-preferences'),
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
from django.conf.urls.defaults import patterns, url
|
try:
|
||||||
|
from django.conf.urls import patterns, url
|
||||||
|
except ImportError: # django < 1.4
|
||||||
|
from django.conf.urls.defaults import patterns, url
|
||||||
|
|
||||||
urlpatterns = patterns('admin_tools.menu.views',
|
urlpatterns = patterns('admin_tools.menu.views',
|
||||||
url(r'^add_bookmark/$', 'add_bookmark', name='admin-tools-menu-add-bookmark'),
|
url(r'^add_bookmark/$', 'add_bookmark', name='admin-tools-menu-add-bookmark'),
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls.defaults import patterns, url, include
|
try:
|
||||||
|
from django.conf.urls import patterns, url, include
|
||||||
|
except ImportError: # django < 1.4
|
||||||
|
from django.conf.urls.defaults import patterns, url, include
|
||||||
|
|
||||||
urls = []
|
urls = []
|
||||||
if 'admin_tools.menu' in settings.INSTALLED_APPS:
|
if 'admin_tools.menu' in settings.INSTALLED_APPS:
|
||||||
|
|
Loading…
Reference in New Issue