Skip to content

Commit

Permalink
Fix Django 1.10 deprecation warnings
Browse files Browse the repository at this point in the history
In django_app/urls.py:
* Use a list instead of `patterns`
* Use view callables instead of strings

Fixes omab#804, omab#754
  • Loading branch information
yprez committed Dec 16, 2015
1 parent b51d824 commit 006d5c9
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions social/apps/django_app/urls.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
"""URLs module"""
from django.conf import settings
try:
from django.conf.urls import patterns, url
from django.conf.urls import url

This comment has been minimized.

Copy link
@tkajtoch

tkajtoch Dec 17, 2015

Removing an unused imports should be separated to another commit.

This comment has been minimized.

Copy link
@yprez

yprez Dec 17, 2015

Author Owner

Why? I just removed it's usage in this commit, it wasn't unused before...

This comment has been minimized.

Copy link
@tkajtoch

tkajtoch Dec 17, 2015

It was too late... my mistake :)

except ImportError:
# Django < 1.4
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import url


from social.utils import setting_name
from . import views

This comment has been minimized.

Copy link
@tkajtoch

tkajtoch Dec 17, 2015

Improper codestyle.

This comment has been minimized.

Copy link
@yprez

yprez Dec 17, 2015

Author Owner

True, PSA uses absolute imports everywhere so I'll change to that.



extra = getattr(settings, setting_name('TRAILING_SLASH'), True) and '/' or ''


urlpatterns = patterns('social.apps.django_app.views',
urlpatterns = [
# authentication / association
url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), 'auth',
url(r'^login/(?P<backend>[^/]+){0}$'.format(extra), views.auth,
name='begin'),
url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), 'complete',
url(r'^complete/(?P<backend>[^/]+){0}$'.format(extra), views.complete,
name='complete'),
# disconnection
url(r'^disconnect/(?P<backend>[^/]+){0}$'.format(extra), 'disconnect',
url(r'^disconnect/(?P<backend>[^/]+){0}$'.format(extra), views.disconnect,
name='disconnect'),
url(r'^disconnect/(?P<backend>[^/]+)/(?P<association_id>[^/]+){0}$'
.format(extra), 'disconnect', name='disconnect_individual'),
)
.format(extra), views.disconnect, name='disconnect_individual'),
]

0 comments on commit 006d5c9

Please sign in to comment.