diff --git a/demo/demoproject/apache/tests.py b/demo/demoproject/apache/tests.py index c24d7a9..b5c9bb6 100644 --- a/demo/demoproject/apache/tests.py +++ b/demo/demoproject/apache/tests.py @@ -1,11 +1,11 @@ import os from django.core.files.base import ContentFile -from django.core.urlresolvers import reverse import django.test from django_downloadview.apache import assert_x_sendfile +from demoproject.compat import reverse from demoproject.apache.views import storage, storage_dir diff --git a/demo/demoproject/apache/urls.py b/demo/demoproject/apache/urls.py index aec9cdf..7af509e 100644 --- a/demo/demoproject/apache/urls.py +++ b/demo/demoproject/apache/urls.py @@ -1,8 +1,8 @@ """URL mapping.""" from django.conf.urls import url +from demoproject.compat import patterns from demoproject.apache import views -from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/demo/demoproject/compat.py b/demo/demoproject/compat.py index 6930bf5..c1ed757 100644 --- a/demo/demoproject/compat.py +++ b/demo/demoproject/compat.py @@ -1,11 +1,22 @@ +from distutils.version import StrictVersion +from django.utils.version import get_version + try: from django.conf.urls import patterns -except Exception: - def urlpatterns(prefix, *args): +except ImportError: + def patterns(prefix, *args): return list(args) try: from django.urls import reverse except ImportError: from django.core.urlresolvers import reverse + +if StrictVersion(get_version()) >= StrictVersion('2.0'): + from django.conf.urls import include as urlinclude + + def include(arg, namespace=None, app_name=None): + return urlinclude((arg, app_name), namespace=namespace) +else: + from django.conf.urls import include diff --git a/demo/demoproject/http/tests.py b/demo/demoproject/http/tests.py index 4296790..7e6a1eb 100644 --- a/demo/demoproject/http/tests.py +++ b/demo/demoproject/http/tests.py @@ -1,8 +1,9 @@ -from django.core.urlresolvers import reverse import django.test from django_downloadview import assert_download_response +from demoproject.compat import reverse + class SimpleURLTestCase(django.test.TestCase): def test_download_response(self): diff --git a/demo/demoproject/http/urls.py b/demo/demoproject/http/urls.py index f8e0c92..6198c39 100644 --- a/demo/demoproject/http/urls.py +++ b/demo/demoproject/http/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.http import views -from demoproject.urlpatterns import patterns + urlpatterns = patterns( '', diff --git a/demo/demoproject/lighttpd/tests.py b/demo/demoproject/lighttpd/tests.py index 4918d15..2a9fc89 100644 --- a/demo/demoproject/lighttpd/tests.py +++ b/demo/demoproject/lighttpd/tests.py @@ -1,11 +1,11 @@ import os from django.core.files.base import ContentFile -from django.core.urlresolvers import reverse import django.test from django_downloadview.lighttpd import assert_x_sendfile +from demoproject.compat import reverse from demoproject.lighttpd.views import storage, storage_dir diff --git a/demo/demoproject/lighttpd/urls.py b/demo/demoproject/lighttpd/urls.py index a325a37..c300ec1 100644 --- a/demo/demoproject/lighttpd/urls.py +++ b/demo/demoproject/lighttpd/urls.py @@ -1,8 +1,8 @@ """URL mapping.""" from django.conf.urls import url +from demoproject.compat import patterns from demoproject.lighttpd import views -from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/demo/demoproject/nginx/tests.py b/demo/demoproject/nginx/tests.py index d3c7930..b8e599b 100644 --- a/demo/demoproject/nginx/tests.py +++ b/demo/demoproject/nginx/tests.py @@ -1,11 +1,11 @@ import os from django.core.files.base import ContentFile -from django.core.urlresolvers import reverse import django.test from django_downloadview.nginx import assert_x_accel_redirect +from demoproject.compat import reverse from demoproject.nginx.views import storage, storage_dir diff --git a/demo/demoproject/nginx/urls.py b/demo/demoproject/nginx/urls.py index 1f13ecb..874a7a7 100644 --- a/demo/demoproject/nginx/urls.py +++ b/demo/demoproject/nginx/urls.py @@ -2,8 +2,8 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.nginx import views -from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/demo/demoproject/object/tests.py b/demo/demoproject/object/tests.py index 527936a..2530d3b 100644 --- a/demo/demoproject/object/tests.py +++ b/demo/demoproject/object/tests.py @@ -1,9 +1,9 @@ from django.core.files.base import ContentFile -from django.core.urlresolvers import reverse import django.test from django_downloadview import temporary_media_root, assert_download_response +from demoproject.compat import reverse from demoproject.object.models import Document diff --git a/demo/demoproject/object/urls.py b/demo/demoproject/object/urls.py index 03e7fd4..ee3f54c 100644 --- a/demo/demoproject/object/urls.py +++ b/demo/demoproject/object/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.object import views -from demoproject.urlpatterns import patterns + urlpatterns = patterns( '', diff --git a/demo/demoproject/path/tests.py b/demo/demoproject/path/tests.py index facef1b..6fe25a8 100644 --- a/demo/demoproject/path/tests.py +++ b/demo/demoproject/path/tests.py @@ -1,8 +1,9 @@ -from django.core.urlresolvers import reverse import django.test from django_downloadview import assert_download_response +from demoproject.compat import reverse + class StaticPathTestCase(django.test.TestCase): def test_download_response(self): diff --git a/demo/demoproject/path/urls.py b/demo/demoproject/path/urls.py index 17dad33..161203d 100644 --- a/demo/demoproject/path/urls.py +++ b/demo/demoproject/path/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.path import views -from demoproject.urlpatterns import patterns + urlpatterns = patterns( '', diff --git a/demo/demoproject/storage/tests.py b/demo/demoproject/storage/tests.py index 8536781..3f0abc2 100644 --- a/demo/demoproject/storage/tests.py +++ b/demo/demoproject/storage/tests.py @@ -2,13 +2,13 @@ import datetime import unittest from django.core.files.base import ContentFile -from django.core.urlresolvers import reverse from django.http.response import HttpResponseNotModified import django.test from django_downloadview import assert_download_response, temporary_media_root from django_downloadview import setup_view +from demoproject.compat import reverse from demoproject.storage import views diff --git a/demo/demoproject/storage/urls.py b/demo/demoproject/storage/urls.py index 53cd38c..1932cd4 100644 --- a/demo/demoproject/storage/urls.py +++ b/demo/demoproject/storage/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.storage import views -from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/demo/demoproject/tests.py b/demo/demoproject/tests.py index 35e6304..9bfc783 100644 --- a/demo/demoproject/tests.py +++ b/demo/demoproject/tests.py @@ -1,6 +1,7 @@ # coding=utf8 """Test suite for demoproject.download.""" -from django.core.urlresolvers import reverse +from demoproject.compat import reverse + from django.test import TestCase diff --git a/demo/demoproject/urlpatterns.py b/demo/demoproject/urlpatterns.py deleted file mode 100644 index 6e046ad..0000000 --- a/demo/demoproject/urlpatterns.py +++ /dev/null @@ -1,5 +0,0 @@ -try: - from django.conf.urls import patterns -except: - def patterns(prefix, *args): - return list(args) diff --git a/demo/demoproject/urls.py b/demo/demoproject/urls.py index dc43654..6ec45f7 100755 --- a/demo/demoproject/urls.py +++ b/demo/demoproject/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import include, url +from django.conf.urls import url from django.views.generic import TemplateView -from demoproject.urlpatterns import patterns +from demoproject.compat import patterns, include home = TemplateView.as_view(template_name='home.html') diff --git a/demo/demoproject/virtual/tests.py b/demo/demoproject/virtual/tests.py index a8b92b0..63aa74e 100644 --- a/demo/demoproject/virtual/tests.py +++ b/demo/demoproject/virtual/tests.py @@ -1,8 +1,9 @@ -from django.core.urlresolvers import reverse import django.test from django_downloadview import assert_download_response +from demoproject.compat import reverse + class TextTestCase(django.test.TestCase): def test_download_response(self): diff --git a/demo/demoproject/virtual/urls.py b/demo/demoproject/virtual/urls.py index 2595b3f..2ad7105 100644 --- a/demo/demoproject/virtual/urls.py +++ b/demo/demoproject/virtual/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url +from demoproject.compat import patterns from demoproject.virtual import views -from demoproject.urlpatterns import patterns urlpatterns = patterns(