misc: remove usage of django.conf.urls.patterns (#15993)

combo/apps/dataviz/urls.py

@@ -14,12 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import ajax_gauge_count
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^ajax/gauge-count/(?P<cell>[\w_-]+)/$',
         ajax_gauge_count, name='combo-ajax-gauge-count'),
-)
+]

combo/apps/family/urls.py

@@ -14,11 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import FamilyLinkView, FamilyUnlinkView
 
-urlpatterns = patterns('',
+urlpatterns = [
         url(r'^family/link', FamilyLinkView.as_view(), name='family-link'),
         url(r'^family/unlink', FamilyUnlinkView.as_view(), name='family-unlink')
-)
+]

combo/apps/lingo/urls.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from combo.urls_utils import decorated_includes, manager_required
 
@@ -25,7 +25,7 @@ from .views import (RegiesApiView, AddBasketItemApiView, PayView, CallbackView,
 from .manager_views import (RegieListView, RegieCreateView, RegieUpdateView,
         RegieDeleteView, TransactionListView, ManagerHomeView, download_transactions_csv)
 
-lingo_manager_urls = patterns('lingo.manager_views',
+lingo_manager_urls = [
     url('^$', ManagerHomeView.as_view(), name='lingo-manager-homepage'),
     url('^transactions/$', TransactionListView.as_view(), name='lingo-manager-transactions-list'),
     url('^transactions/download-csv/$', download_transactions_csv, name='lingo-manager-transactions-download'),
@@ -35,9 +35,9 @@ lingo_manager_urls = patterns('lingo.manager_views',
         name='lingo-manager-regie-edit'),
     url('^regies/(?P<pk>\w+)/delete$', RegieDeleteView.as_view(),
         name='lingo-manager-regie-delete'),
-)
+]
 
-urlpatterns = patterns('',
+urlpatterns = [
     url('^api/lingo/regies$', RegiesApiView.as_view(), name='api-regies'),
     url('^api/lingo/add-basket-item$', AddBasketItemApiView.as_view(),
         name='api-add-basket-item'),
@@ -59,4 +59,4 @@ urlpatterns = patterns('',
         ItemView.as_view(), name='view-item'),
     url(r'^lingo/self-invoice/(?P<cell_id>\w+)/$', SelfInvoiceView.as_view(),
         name='lingo-self-invoice'),
-)
+]

combo/apps/momo/urls.py

@@ -14,19 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from combo.urls_utils import decorated_includes, manager_required
 
 from .views import MomoManagerView, OptionsUpdateView, generate
 
-momo_manager_urls = patterns('momo.manager_views',
+momo_manager_urls = [
     url('^$', MomoManagerView.as_view(), name='momo-manager-homepage'),
     url('^options/$', OptionsUpdateView.as_view(), name='momo-manager-options'),
     url('^generate/$', generate, name='momo-manager-generate'),
-)
+]
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^manage/momo/', decorated_includes(manager_required,
         include(momo_manager_urls))),
-)
+]

combo/apps/newsletters/urls.py

@@ -1,9 +1,9 @@
 from django.contrib.auth.decorators import login_required
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import NewslettersView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url('^newsletters/(?P<pk>\w+)/update$', login_required(NewslettersView.as_view()),
         name='newsletters-update'),
-)
+]

combo/apps/notifications/urls.py

@@ -14,15 +14,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .api_views import add, ack, forget
 
-urlpatterns = patterns('',
+urlpatterns = [
     url('^api/notification/add/$', add,
         name='api-notification-add'),
     url('^api/notification/ack/(?P<notification_id>[\w-]+)/$', ack,
         name='api-notification-ack'),
     url('^api/notification/forget/(?P<notification_id>[\w-]+)/$', forget,
         name='api-notification-forget'),
-)
+]

combo/apps/publik/urls.py

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import services_js
 
-urlpatterns = patterns('', url('^__services.js', services_js))
+urlpatterns = [url('^__services.js', services_js)]

combo/apps/search/urls.py

@@ -14,12 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .models import SearchCell
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^ajax/search/(?P<cell_pk>\w+)/$', SearchCell.ajax_results_view,
         name='combo-search-ajax-results'),
-)
+]

combo/apps/usersearch/urls.py

@@ -14,12 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import ajax_usersearch
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^ajax/usersearch/$',
         ajax_usersearch, name='combo-ajax-usersearch'),
-)
+]

combo/manager/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 <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from .. import plugins
 from . import views
 
-urlpatterns = patterns('combo.views',
+urlpatterns = [
         url(r'^$', views.homepage, name='combo-manager-homepage'),
         url(r'^menu.json$', views.menu_json),
         url(r'^site-export$', views.site_export, name='combo-manager-site-export'),
@@ -64,7 +64,7 @@ urlpatterns = patterns('combo.views',
             name='combo-manager-page-order'),
         url(r'^assets/$', views.assets, name='combo-manager-assets'),
         url(r'^assets/delete$', views.asset_delete, name='combo-manager-asset-delete'),
-        (r'^ckeditor/', include('ckeditor.urls')),
-)
+        url(r'^ckeditor/', include('ckeditor.urls')),
+]
 
 urlpatterns = plugins.register_plugins_manager_urls(urlpatterns)

combo/plugins.py

@@ -19,7 +19,7 @@ from pkg_resources import iter_entry_points
 import logging
 
 from django.apps import apps
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.http import Http404
 from django.views.debug import technical_404_response
 
@@ -70,9 +70,7 @@ def register_plugins_urls(urlpatterns):
         urls = get_plugin_includes(plugin, 'get_after_urls')
         if urls:
             post_urls.append(urls)
-    pre_patterns = patterns('', *pre_urls)
-    post_patterns = patterns('', *post_urls)
-    return pre_patterns + urlpatterns + post_patterns
+    return pre_urls + urlpatterns + post_urls
 
 def register_plugins_manager_urls(urlpatterns):
     pre_urls = []
@@ -84,9 +82,7 @@ def register_plugins_manager_urls(urlpatterns):
         urls = get_plugin_includes(plugin, 'get_after_manager_urls')
         if urls:
             post_urls.append(urls)
-    pre_patterns = patterns('', *pre_urls)
-    post_patterns = patterns('', *post_urls)
-    return pre_patterns + urlpatterns + post_patterns
+    return pre_urls + urlpatterns + post_urls
 
 def register_plugins_apps(installed_apps):
     installed_apps = tuple(installed_apps)

combo/public/urls.py

@@ -14,16 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-urlpatterns = patterns('combo.publicviews',
+urlpatterns = [
     url(r'^api/menu-badges/', views.menu_badges),
     url(r'^api/search/', views.api_search, name='api-search'),
     url(r'^ajax/cell/(?P<page_pk>\w+)/(?P<cell_reference>[\w_-]+)/$',
         views.ajax_page_cell, name='combo-public-ajax-page-cell'),
-    (r'__style__/$', views.style),
-    (r'__skeleton__/$', views.skeleton),
-    (r'', views.page),
-)
+    url(r'__style__/$', views.style),
+    url(r'__skeleton__/$', views.skeleton),
+    url(r'', views.page),
+]

combo/urls.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -27,26 +27,25 @@ from .manager.urls import urlpatterns as combo_manager_urls
 
 from . import plugins
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^manage/', decorated_includes(manager_required,
         include(combo_manager_urls))),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^logout/$', logout, name='auth_logout'),
     url(r'^login/$', login, name='auth_login'),
     url(r'^404$', error404),
-)
+]
 
 handler404 = error404
 
 if 'mellon' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('', url(r'^accounts/mellon/', include('mellon.urls')))
+    urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls')))
 
 # static and media files
 urlpatterns += staticfiles_urlpatterns()
-
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns = plugins.register_plugins_urls(urlpatterns)
 
 # other URLs are handled as public URLs
-urlpatterns += patterns('', url(r'', include('combo.public.urls')))
+urlpatterns.append(url(r'', include('combo.public.urls')))