From 6844507d0da8e97f286a71a8e9db26a7a7d88de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 1 Jan 2018 12:03:29 +0100 Subject: [PATCH 1/4] general: update urls.py for django 1.11 (#20933) --- hobo/emails/urls.py | 6 +++--- hobo/environment/urls.py | 6 +++--- hobo/profile/urls.py | 6 +++--- hobo/theme/urls.py | 6 +++--- hobo/urls.py | 23 ++++++++++++----------- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/hobo/emails/urls.py b/hobo/emails/urls.py index 90e4087..d19d7ba 100644 --- a/hobo/emails/urls.py +++ b/hobo/emails/urls.py @@ -14,10 +14,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', views.home, name='emails-home'), -) +] diff --git a/hobo/environment/urls.py b/hobo/environment/urls.py index 0aeab30..58f5519 100644 --- a/hobo/environment/urls.py +++ b/hobo/environment/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from .views import * -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', HomeView.as_view(), name='environment-home'), url(r'^variables$', VariablesView.as_view(), name='environment-variables'), url(r'^new-variable$', VariableCreateView.as_view(), name='new-variable',), @@ -19,4 +19,4 @@ urlpatterns = patterns('', url(r'^new-variable-(?P\w+)/(?P[\w-]+)$', VariableCreateView.as_view(), name='new-variable-service',), url(r'^debug.json$', debug_json, name='debug-json'), -) +] diff --git a/hobo/profile/urls.py b/hobo/profile/urls.py index c803850..e271c79 100644 --- a/hobo/profile/urls.py +++ b/hobo/profile/urls.py @@ -14,13 +14,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', views.home, name='profile-home'), url(r'(?P[\w-]+)/options', views.options, name='profile-attribute-options'), url(r'^reorder$', views.reorder, name='profile-reorder'), url(r'^add-attribute$', views.add_attribute, name='profile-add-attribute'), -) +] diff --git a/hobo/theme/urls.py b/hobo/theme/urls.py index 88f5e59..62999d6 100644 --- a/hobo/theme/urls.py +++ b/hobo/theme/urls.py @@ -14,12 +14,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', views.home, name='theme-home'), url(r'^select$', views.select, name='theme-select'), url(r'^options$', views.options, name='theme-options'), -) +] diff --git a/hobo/urls.py b/hobo/urls.py index 03042a3..c0af2d4 100644 --- a/hobo/urls.py +++ b/hobo/urls.py @@ -1,18 +1,18 @@ from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin admin.autodiscover() -from .views import admin_required, login, login_local, logout +from .views import admin_required, login, login_local, logout, home, menu_json, hobo from .urls_utils import decorated_includes from .environment.urls import urlpatterns as environment_urls from .profile.urls import urlpatterns as profile_urls from .theme.urls import urlpatterns as theme_urls from .emails.urls import urlpatterns as emails_urls -urlpatterns = patterns('', - url(r'^$', 'hobo.views.home', name='home'), +urlpatterns = [ + url(r'^$', home, name='home'), url(r'^sites/', decorated_includes(admin_required, include(environment_urls))), url(r'^profile/', decorated_includes(admin_required, @@ -20,19 +20,20 @@ urlpatterns = patterns('', url(r'^theme/', decorated_includes(admin_required, include(theme_urls))), url(r'^emails/', decorated_includes(admin_required, include(emails_urls))), - url(r'^menu.json$', 'hobo.views.menu_json', name='menu_json'), - url(r'^hobos.json$', 'hobo.views.hobo'), + url(r'^menu.json$', menu_json, name='menu_json'), + url(r'^hobos.json$', hobo), url(r'^admin/', include(admin.site.urls)), -) +] # add authentication patterns -urlpatterns += patterns('', +urlpatterns += [ url(r'^logout/$', logout, name='logout'), url(r'^login/$', login, name='auth_login'), url(r'^login/local/$', login_local), # to be used as backup, in case of idp down url(r'^accounts/mellon/', include('mellon.urls')), -) +] + if 'hobo.contrib.ozwillo' in settings.INSTALLED_APPS: - urlpatterns += patterns('', + urlpatterns += [ url(r'ozwillo/', include('hobo.contrib.ozwillo.urls')), - ) + ] -- 2.15.1