Fix django.conf.urls compatibility issues

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
 
 

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(

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

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):

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(
     '',

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
 
 

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(

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
 
 

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(

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
 
 

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(
     '',

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):

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(
     '',

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
 
 

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(

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
 
 

demo/demoproject/urlpatterns.py

@@ -1,5 +0,0 @@
-try:
-    from django.conf.urls import patterns
-except:
-    def patterns(prefix, *args):
-        return list(args)

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')

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):

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(