Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django 1.10: Replace test fixture reliance on deprecated SHA1 hasher #71

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Django 1.10: Replace test fixture reliance on deprecated SHA1 hasher #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
069099e
Django 1.9 support: Remove dependency on django.conf.urls.patterns
adevore Jun 3, 2016
95a2bd2
Django 1.10: Remove reliance on deprecated SHA1 hasher
adevore Jun 3, 2016
7096e43
Django 1.10: Switch to an explicitly allowed SHA1 test fixture
adevore Jun 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions ajax/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
from __future__ import absolute_import
from django.conf.urls import *
from django.views.static import serve
from ajax import views
import django
import os

JAVASCRIPT_PATH = "%s/js" % os.path.dirname(__file__)

urlpatterns = patterns('ajax.views',
(r'^(?P<application>\w+)/(?P<model>\w+).json', 'endpoint_loader'),
(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<method>\w+).json', 'endpoint_loader'),
(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<pk>\d+)/(?P<method>\w+)/?(?P<taggit_command>(add|remove|set|clear|similar))?.json$', 'endpoint_loader'),
(r'^js/(?P<path>.*)$', serve,
{'document_root': JAVASCRIPT_PATH}),
)
if django.VERSION < (1, 8):
urlpatterns = patterns('ajax.views',
(r'^(?P<application>\w+)/(?P<model>\w+).json', 'endpoint_loader'),
(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<method>\w+).json', 'endpoint_loader'),
(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<pk>\d+)/(?P<method>\w+)/?(?P<taggit_command>(add|remove|set|clear|similar))?.json$', 'endpoint_loader'),
(r'^js/(?P<path>.*)$', serve,
{'document_root': JAVASCRIPT_PATH}),
)
else:
urlpatterns = [
url(r'^(?P<application>\w+)/(?P<model>\w+).json', views.endpoint_loader),
url(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<method>\w+).json', views.endpoint_loader),
url(r'^(?P<application>\w+)/(?P<model>\w+)/(?P<pk>\d+)/(?P<method>\w+)/?(?P<taggit_command>(add|remove|set|clear|similar))?.json$', views.endpoint_loader),
url(r'^js/(?P<path>.*)$', serve,
{'document_root': JAVASCRIPT_PATH}),
]
4 changes: 4 additions & 0 deletions tests/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,7 @@

# django-ajax specific settings
MAX_PER_PAGE = 20
# Explicitly allow the deprecated SHA1 hasher to speed up tests
PASSWORD_HASHERS = [
'django.contrib.auth.hashers.SHA1PasswordHasher',
]
18 changes: 13 additions & 5 deletions tests/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
from __future__ import absolute_import
from django.conf.urls import patterns, include, url
import django
try:
from django.conf.urls import patterns, include, url
except ImportError:
from django.conf.urls import include, url


urlpatterns = patterns('',
url(r'^ajax/', include('ajax.urls')),
)
if django.VERSION < (1, 8):
urlpatterns = patterns('',
url(r'^ajax/', include('ajax.urls')),
)
else:
urlpatterns = [
url(r'^ajax/', include('ajax.urls'))
]