Merge pull request #28 from mikaelengstrom/master

Add Django2 support

multiurl.py

@@ -1,6 +1,16 @@
 from __future__ import unicode_literals
 
-from django.core import urlresolvers
+try:
+    from django import urls as urlresolvers
+    from django.urls.resolvers import RegexPattern
+except ImportError:
+    # Fallbacks and mocks for Django 1.*
+    from django.core import urlresolvers
+
+    urlresolvers.URLResolver = urlresolvers.RegexURLResolver
+
+    def RegexPattern(pattern):
+        return pattern
 
 
 class ContinueResolving(Exception):
@@ -12,9 +22,9 @@ def multiurl(*urls, **kwargs):
     return MultiRegexURLResolver(urls, exceptions)
 
 
-class MultiRegexURLResolver(urlresolvers.RegexURLResolver):
+class MultiRegexURLResolver(urlresolvers.URLResolver):
     def __init__(self, urls, exceptions):
-        super(MultiRegexURLResolver, self).__init__('', None)
+        super(MultiRegexURLResolver, self).__init__(RegexPattern(''), None)
         self._urls = urls
         self._exceptions = exceptions
 

tests.py

@@ -4,16 +4,28 @@
 
 from django.conf import settings
 from django.conf.urls import url
-from django.core.urlresolvers import RegexURLResolver, Resolver404, NoReverseMatch
+
 from django.http import HttpResponse
 
 from multiurl import multiurl, ContinueResolving
 
+try:
+    from django import urls as urlresolvers
+    from django.urls.resolvers import RegexPattern
+except ImportError:
+    # Fallbacks and mocks for Django 1.*
+    from django.core import urlresolvers
+
+    urlresolvers.URLResolver = urlresolvers.RegexURLResolver
+
+    def RegexPattern(pattern):
+        return pattern
+
 
 class MultiviewTests(unittest.TestCase):
     def setUp(self):
         # Patterns with a "catch all" view (thing) at the end.
-        self.patterns_catchall = RegexURLResolver('^/', [
+        self.patterns_catchall = urlresolvers.URLResolver(RegexPattern(r'^/'), [
             multiurl(
                 url(r'^(\w+)/$', person, name='person'),
                 url(r'^(\w+)/$', place, name='place'),
@@ -22,7 +34,7 @@ def setUp(self):
         ])
 
         # Patterns with no "catch all" - last view could still raise ContinueResolving.
-        self.patterns_no_fallthrough = RegexURLResolver('^/', [
+        self.patterns_no_fallthrough = urlresolvers.URLResolver(RegexPattern(r'^/'), [
             multiurl(
                 url(r'^(\w+)/$', person, name='person'),
                 url(r'^(\w+)/$', place, name='place'),
@@ -46,26 +58,27 @@ def test_resolve_match_last(self):
 
     def test_resolve_match_faillthrough(self):
         m = self.patterns_no_fallthrough.resolve('/bacon/')
-        with self.assertRaises(Resolver404):
+        with self.assertRaises(urlresolvers.Resolver404):
             m.func(request=None, *m.args, **m.kwargs)
 
     def test_no_match(self):
-        with self.assertRaises(Resolver404):
+        with self.assertRaises(urlresolvers.Resolver404):
             self.patterns_catchall.resolve('/eggs/and/bacon/')
 
     def test_reverse(self):
         self.assertEqual('joe/', self.patterns_catchall.reverse('person', 'joe'))
         self.assertEqual('joe/', self.patterns_catchall.reverse('place', 'joe'))
         self.assertEqual('joe/', self.patterns_catchall.reverse('thing', 'joe'))
-        with self.assertRaises(NoReverseMatch):
+        with self.assertRaises(urlresolvers.NoReverseMatch):
             self.patterns_catchall.reverse('person')
-        with self.assertRaises(NoReverseMatch):
+        with self.assertRaises(urlresolvers.NoReverseMatch):
             self.patterns_catchall.reverse('argh', 'xyz')
 
 #
 # Some "views" to test against.
 #
 
+
 def person(request, name):
     people = {
         'john': 'John Smith',
@@ -75,6 +88,7 @@ def person(request, name):
         return HttpResponse("Person: " + people[name])
     raise ContinueResolving
 
+
 def place(request, name):
     places = {
         'sf': 'San Francisco',
@@ -84,9 +98,11 @@ def place(request, name):
         return HttpResponse("Place: " + places[name])
     raise ContinueResolving
 
+
 def thing(request, name):
     return HttpResponse("Thing: " + name.title())
 
+
 if __name__ == '__main__':
     settings.configure()
     unittest.main()

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36}-django110, {py27,py34,py35,py36}-django19, {py27,py32,py33,py34,py35,py36}-django18, {py27,py32,py33,py34}-django17
+envlist = {py34,py35,py36}-django20, {py27,py35,py36}-django110, {py27,py34,py35,py36}-django19, {py27,py32,py33,py34,py35,py36}-django18, {py27,py32,py33,py34}-django17
 
 [testenv]
 commands = python tests.py
@@ -17,3 +17,4 @@ deps=
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    django20: Django>=2.0