summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastermain/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/toastermain/urls.py')
-rw-r--r--bitbake/lib/toaster/toastermain/urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py
index ac77bc3632..5fb520b384 100644
--- a/bitbake/lib/toaster/toastermain/urls.py
+++ b/bitbake/lib/toaster/toastermain/urls.py
@@ -51,7 +51,7 @@ if toastermain.settings.DEBUG_PANEL_ENABLED:
51 51
52urlpatterns = [ 52urlpatterns = [
53 # Uncomment the next line to enable the admin: 53 # Uncomment the next line to enable the admin:
54 url(r'^admin/', include(admin.site.urls)), 54 url(r'^admin/', admin.site.urls),
55] + urlpatterns 55] + urlpatterns
56 56
57# Automatically discover urls.py in various apps, beside our own 57# Automatically discover urls.py in various apps, beside our own
@@ -69,7 +69,7 @@ for t in os.walk(os.path.dirname(currentdir)):
69 # make sure we don't have this module name in 69 # make sure we don't have this module name in
70 conflict = False 70 conflict = False
71 for p in urlpatterns: 71 for p in urlpatterns:
72 if p.regex.pattern == '^' + modulename + '/': 72 if p.pattern.regex.pattern == '^' + modulename + '/':
73 conflict = True 73 conflict = True
74 if not conflict: 74 if not conflict:
75 urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls'))) 75 urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls')))