Skip to content

Commit

Permalink
Remove pattern call in URL confs
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlton Gibson committed Sep 4, 2015
1 parent 20cd2a6 commit 16aec47
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 37 deletions.
7 changes: 3 additions & 4 deletions 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"),
Expand Down Expand Up @@ -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"),
)
]
6 changes: 3 additions & 3 deletions 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

Expand All @@ -7,7 +7,7 @@

urlpatterns = default_urlpatterns(FacebookProvider)

urlpatterns += patterns('',
urlpatterns += [
url('^facebook/login/token/$', views.login_by_token,
name="facebook_login_by_token"),
)
]
14 changes: 7 additions & 7 deletions 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'),
]
9 changes: 4 additions & 5 deletions 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")
]
8 changes: 4 additions & 4 deletions 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')
]
7 changes: 3 additions & 4 deletions 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
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.rst
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions 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)),
]

0 comments on commit 16aec47

Please sign in to comment.