From 16aec4709a64814ffc8850650ed2ce37b885f64b Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 4 Sep 2015 10:57:23 +0200 Subject: [PATCH] Remove `pattern` call in URL confs --- allauth/account/urls.py | 7 +++---- allauth/socialaccount/providers/facebook/urls.py | 6 +++--- allauth/socialaccount/providers/openid/urls.py | 14 +++++++------- allauth/socialaccount/providers/persona/urls.py | 9 ++++----- allauth/socialaccount/urls.py | 8 ++++---- allauth/urls.py | 7 +++---- docs/installation.rst | 6 +++--- example/example/urls.py | 14 +++++++------- 8 files changed, 34 insertions(+), 37 deletions(-) diff --git a/allauth/account/urls.py b/allauth/account/urls.py index b3b2115f75..35aa3c6afe 100644 --- a/allauth/account/urls.py +++ b/allauth/account/urls.py @@ -1,10 +1,9 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic import RedirectView from . import views -urlpatterns = patterns( - "", +urlpatterns = [ url(r"^signup/$", views.signup, name="account_signup"), url(r"^login/$", views.login, name="account_login"), url(r"^logout/$", views.logout, name="account_logout"), @@ -32,4 +31,4 @@ name="account_reset_password_from_key"), url(r"^password/reset/key/done/$", views.password_reset_from_key_done, name="account_reset_password_from_key_done"), -) +] diff --git a/allauth/socialaccount/providers/facebook/urls.py b/allauth/socialaccount/providers/facebook/urls.py index c7ab39a2cc..49182a2006 100644 --- a/allauth/socialaccount/providers/facebook/urls.py +++ b/allauth/socialaccount/providers/facebook/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns @@ -7,7 +7,7 @@ urlpatterns = default_urlpatterns(FacebookProvider) -urlpatterns += patterns('', +urlpatterns += [ url('^facebook/login/token/$', views.login_by_token, name="facebook_login_by_token"), - ) +] diff --git a/allauth/socialaccount/providers/openid/urls.py b/allauth/socialaccount/providers/openid/urls.py index cdbc680ec4..eac4c8d796 100644 --- a/allauth/socialaccount/providers/openid/urls.py +++ b/allauth/socialaccount/providers/openid/urls.py @@ -1,10 +1,10 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns('', - url('^openid/login/$', views.login, - name="openid_login"), - url('^openid/callback/$', views.callback, - name='openid_callback'), - ) +urlpatterns = [ + url('^openid/login/$', views.login, + name="openid_login"), + url('^openid/callback/$', views.callback, + name='openid_callback'), +] diff --git a/allauth/socialaccount/providers/persona/urls.py b/allauth/socialaccount/providers/persona/urls.py index a7664caec4..d5207da34c 100644 --- a/allauth/socialaccount/providers/persona/urls.py +++ b/allauth/socialaccount/providers/persona/urls.py @@ -1,8 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns('', - url('^persona/login/$', - views.persona_login, - name="persona_login")) +urlpatterns = [ + url('^persona/login/$', views.persona_login, name="persona_login") +] diff --git a/allauth/socialaccount/urls.py b/allauth/socialaccount/urls.py index 25922d6741..da4b24b6e8 100644 --- a/allauth/socialaccount/urls.py +++ b/allauth/socialaccount/urls.py @@ -1,11 +1,11 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views -urlpatterns = patterns( - '', +urlpatterns = [ url('^login/cancelled/$', views.login_cancelled, name='socialaccount_login_cancelled'), url('^login/error/$', views.login_error, name='socialaccount_login_error'), url('^signup/$', views.signup, name='socialaccount_signup'), - url('^connections/$', views.connections, name='socialaccount_connections')) + url('^connections/$', views.connections, name='socialaccount_connections') +] diff --git a/allauth/urls.py b/allauth/urls.py index 45c60c4e3e..e85d05dc12 100644 --- a/allauth/urls.py +++ b/allauth/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url, patterns, include +from django.conf.urls import url, include try: import importlib @@ -9,11 +9,10 @@ from . import app_settings -urlpatterns = patterns('', url('^', include('allauth.account.urls'))) +urlpatterns = [url('^', include('allauth.account.urls'))] if app_settings.SOCIALACCOUNT_ENABLED: - urlpatterns += patterns('', url('^social/', - include('allauth.socialaccount.urls'))) + urlpatterns += [url('^social/', include('allauth.socialaccount.urls'))] for provider in providers.registry.get_list(): try: diff --git a/docs/installation.rst b/docs/installation.rst index 0333ffaec3..d220ff05e2 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -94,11 +94,11 @@ settings.py (Important - Please note 'django.contrib.sites' is required as INSTA urls.py:: - urlpatterns = patterns('', + urlpatterns = [ ... - (r'^accounts/', include('allauth.urls')), + url(r'^accounts/', include('allauth.urls')), ... - ) + ] Post-Installation diff --git a/example/example/urls.py b/example/example/urls.py index 077d970d2a..4f24435e66 100644 --- a/example/example/urls.py +++ b/example/example/urls.py @@ -1,11 +1,11 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.contrib import admin from django.views.generic.base import TemplateView admin.autodiscover() -urlpatterns = patterns('', - (r'^accounts/', include('allauth.urls')), - url(r'^$', TemplateView.as_view(template_name='index.html')), - url(r'^accounts/profile/$', TemplateView.as_view(template_name='profile.html')), - url(r'^admin/', include(admin.site.urls)), -) +urlpatterns = [ + url(r'^accounts/', include('allauth.urls')), + url(r'^$', TemplateView.as_view(template_name='index.html')), + url(r'^accounts/profile/$', TemplateView.as_view(template_name='profile.html')), + url(r'^admin/', include(admin.site.urls)), +] \ No newline at end of file