[extensions-web] django: don't use deprecated django.conf.urls.patterns
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web] django: don't use deprecated django.conf.urls.patterns
- Date: Sat, 1 Dec 2018 16:45:43 +0000 (UTC)
commit 5116da8e90b75f392af35b7e5d2c4d3d990c347f
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Sat Dec 1 20:45:29 2018 +0400
django: don't use deprecated django.conf.urls.patterns
sweettooth/auth/urls.py | 7 +++----
sweettooth/errorreports/urls.py | 6 +++---
sweettooth/extensions/urls.py | 14 +++++++-------
sweettooth/ratings/urls.py | 6 +++---
sweettooth/review/urls.py | 7 +++----
sweettooth/urls.py | 6 +++---
6 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/sweettooth/auth/urls.py b/sweettooth/auth/urls.py
index 2187202..ac447e7 100644
--- a/sweettooth/auth/urls.py
+++ b/sweettooth/auth/urls.py
@@ -1,11 +1,11 @@
from django.views.generic.base import TemplateView
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
from django.contrib.auth import views as auth_views
from sweettooth.auth import views, forms
from registration.backends.default.views import RegistrationView
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^login/', auth_views.login,
dict(template_name='registration/login.html',
authentication_form=forms.AuthenticationForm), name='auth-login'),
@@ -24,5 +24,4 @@ urlpatterns = patterns('',
url(r'', include('registration.backends.default.urls')),
url(r'^profile/(?P<user>.+)', views.profile, name='auth-profile'),
url(r'^profile/', views.profile_redirect, name='auth-profile'),
-
-)
+]
diff --git a/sweettooth/errorreports/urls.py b/sweettooth/errorreports/urls.py
index 66f80de..d10655d 100644
--- a/sweettooth/errorreports/urls.py
+++ b/sweettooth/errorreports/urls.py
@@ -1,9 +1,9 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from sweettooth.errorreports import views
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^report/(?P<pk>\d+)', views.report_error),
url(r'^view/(?P<pk>\d+)', views.view_error_report),
-)
+]
diff --git a/sweettooth/extensions/urls.py b/sweettooth/extensions/urls.py
index 6cc1c03..e90b33a 100644
--- a/sweettooth/extensions/urls.py
+++ b/sweettooth/extensions/urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from django.views.generic.base import TemplateView
from sweettooth.extensions import views, models, feeds
-ajax_patterns = patterns('',
+ajax_patterns = [
url(r'^edit/(?P<pk>\d+)', views.ajax_inline_edit_view, name='extensions-ajax-inline'),
url(r'^upload/screenshot/(?P<pk>\d+)', views.ajax_upload_screenshot_view,
name='extensions-ajax-screenshot'),
url(r'^upload/icon/(?P<pk>\d+)', views.ajax_upload_icon_view, name='extensions-ajax-icon'),
@@ -15,9 +15,9 @@ ajax_patterns = patterns('',
url(r'^set-status/inactive/', views.ajax_set_status_view,
dict(newstatus=models.STATUS_INACTIVE), name='extensions-ajax-set-status-inactive'),
url(r'^adjust-popularity/', views.ajax_adjust_popularity_view),
-)
+]
-shell_patterns = patterns('',
+shell_patterns = [
url(r'^extension-query/', views.ajax_query_view, name='extensions-query'),
url(r'^extension-info/', views.ajax_details_view),
@@ -26,9 +26,9 @@ shell_patterns = patterns('',
views.shell_download, name='extensions-shell-download'),
url(r'^update-info/', views.shell_update, name='extensions-shell-update'),
-)
+]
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^$', TemplateView.as_view(template_name='extensions/list.html'), name='extensions-index'),
url(r'^about/$', TemplateView.as_view(template_name='extensions/about.html'), name='extensions-about'),
@@ -45,4 +45,4 @@ urlpatterns = patterns('',
url(r'^upload/', views.upload_file, name='extensions-upload-file'),
url(r'^ajax/', include(ajax_patterns)),
url(r'', include(shell_patterns)),
-)
+]
diff --git a/sweettooth/ratings/urls.py b/sweettooth/ratings/urls.py
index c8ecc33..469fb97 100644
--- a/sweettooth/ratings/urls.py
+++ b/sweettooth/ratings/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
from sweettooth.ratings import views
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^posted/$', views.comment_done, name='comments-comment-done'),
url(r'^all/$', views.get_comments),
-)
+]
diff --git a/sweettooth/review/urls.py b/sweettooth/review/urls.py
index 885cfd8..23cdb63 100644
--- a/sweettooth/review/urls.py
+++ b/sweettooth/review/urls.py
@@ -1,11 +1,11 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from django.views.generic.list import ListView
from sweettooth.extensions.models import ExtensionVersion
from sweettooth.review import views
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^$', ListView.as_view(template_name='review/list.html',
queryset=ExtensionVersion.objects.unreviewed(),
context_object_name='version_list'),
@@ -19,5 +19,4 @@ urlpatterns = patterns('',
views.download_zipfile, name='review-download'),
url(r'^(?P<pk>\d+)', views.review_version_view, name='review-version'),
-
-)
+]
diff --git a/sweettooth/urls.py b/sweettooth/urls.py
index 70aba0b..21edfc1 100644
--- a/sweettooth/urls.py
+++ b/sweettooth/urls.py
@@ -1,7 +1,7 @@
import os.path
-from django.conf.urls import patterns, include, url, handler404, handler500
+from django.conf.urls import include, url, handler404, handler500
from django.conf import settings
from django.http import HttpResponse
@@ -10,7 +10,7 @@ from django.views import static
from django.views.generic.base import TemplateView
admin.autodiscover()
-urlpatterns = patterns('',
+urlpatterns = [
# 'login' and 'register'
url(r'^accounts/', include('sweettooth.auth.urls')),
url(r'^', include('sweettooth.extensions.urls'), name='index'),
@@ -22,7 +22,7 @@ urlpatterns = patterns('',
url(r'^comments/', include('sweettooth.ratings.urls')),
url(r'^comments/', include('django_comments.urls')),
url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
-)
+]
if settings.DEBUG:
# Use static.serve for development...
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]