diff --git a/ajax/urls.py b/ajax/urls.py index 0a8f20f..790b182 100644 --- a/ajax/urls.py +++ b/ajax/urls.py @@ -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\w+)/(?P\w+).json', 'endpoint_loader'), - (r'^(?P\w+)/(?P\w+)/(?P\w+).json', 'endpoint_loader'), - (r'^(?P\w+)/(?P\w+)/(?P\d+)/(?P\w+)/?(?P(add|remove|set|clear|similar))?.json$', 'endpoint_loader'), - (r'^js/(?P.*)$', serve, - {'document_root': JAVASCRIPT_PATH}), -) +if django.VERSION < (1, 8): + urlpatterns = patterns('ajax.views', + (r'^(?P\w+)/(?P\w+).json', 'endpoint_loader'), + (r'^(?P\w+)/(?P\w+)/(?P\w+).json', 'endpoint_loader'), + (r'^(?P\w+)/(?P\w+)/(?P\d+)/(?P\w+)/?(?P(add|remove|set|clear|similar))?.json$', 'endpoint_loader'), + (r'^js/(?P.*)$', serve, + {'document_root': JAVASCRIPT_PATH}), + ) +else: + urlpatterns = [ + url(r'^(?P\w+)/(?P\w+).json', views.endpoint_loader), + url(r'^(?P\w+)/(?P\w+)/(?P\w+).json', views.endpoint_loader), + url(r'^(?P\w+)/(?P\w+)/(?P\d+)/(?P\w+)/?(?P(add|remove|set|clear|similar))?.json$', views.endpoint_loader), + url(r'^js/(?P.*)$', serve, + {'document_root': JAVASCRIPT_PATH}), + ] diff --git a/tests/settings.py b/tests/settings.py index 8d1a702..6e13bca 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -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', +] diff --git a/tests/urls.py b/tests/urls.py index 0e725b3..312f929 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -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')) + ]