support for dj 1.10

Django no longer supports string views so I had to remove it with all of its tests

.travis.yml

@@ -12,6 +12,7 @@ env:
   - DJANGO_VERSION=1.8.7
   - DJANGO_VERSION=1.8.0
   - DJANGO_VERSION=1.9.1
+  - DJANGO_VERSION=1.10.4
 
 install:
  - pip install coveralls

tests/included_app/routed_views.py

@@ -14,8 +14,3 @@ class RoutedView(View):
 @route(U / 'aliased_view', name='aliased_view')
 def routed_view():
     pass
-
-route(U / 'string_view', 'tests.included_app.routed_views.string_view')
-
-def string_view():
-    pass

tests/test_urljects.py

@@ -12,25 +12,19 @@
 from . import views
 
 
-URLTest = namedtuple('URLTest', ['old_url', 'new_url', 'view', 'name'])
+URLTest = namedtuple('URLTest', ['old_url', 'new_url'])
 test_data = [
     URLTest(
         old_url=r'^detail/(?P<slug>[\w-]+)$',
         new_url=U / 'detail' / slug,
-        view=None,
-        name=None
     ),
     URLTest(
         old_url=r'^(?P<slug>[\w-]+)$',
         new_url=U / slug,
-        view=None,
-        name=None
     ),
     URLTest(
         old_url=r'^static$',
         new_url=U / 'static',
-        view=None,
-        name=None
     ),
 ]
 
@@ -82,13 +76,12 @@ class TestURL(unittest.TestCase):
 
     @mock.patch('django.conf.urls.url')
     def test_func_view(self, mocked_url):
-        url(U, view=views.test_view, prefix='prefix')
+        url(U, view=views.test_view)
         mocked_url.assert_called_once_with(
             regex='^$',
             view=views.test_view,
             kwargs=None,
             name='test_view',
-            prefix='prefix'
         )
 
     @mock.patch('django.conf.urls.url')
@@ -99,7 +92,6 @@ def test_string_view(self, mocked_url):
             view='views.test_view',
             kwargs=None,
             name='test_view',
-            prefix=''
         )
 
     @mock.patch('django.conf.urls.url')
@@ -110,7 +102,6 @@ def test_class_view(self, mocked_url):
             view=views.ViewClass.as_view(),
             kwargs=None,
             name=views.ViewClass.url_name,
-            prefix=''
         )
 
 
@@ -140,13 +131,6 @@ def test_named_included_views(self):
         self.assertEqual(reverse(viewname='named:IncludedView'),
                          u'/included/IncludedView')
 
-    def test_string_included_views(self):
-        self.assertEqual(reverse(viewname='string_import:included_view'),
-                         u'/string/included_view')
-
-        self.assertEqual(reverse(viewname='string_import:IncludedView'),
-                         u'/string/IncludedView')
-
     def test_wild_card(self):
         self.assertEqual(reverse(viewname='wild_card:included_view'),
                          u'/included_view')
@@ -163,6 +147,3 @@ def test_named_routed_views(self):
 
         self.assertEqual(reverse(viewname='routed:aliased_view'),
                          u'/routed/aliased_view')
-
-        self.assertEqual(reverse(viewname='routed:string_view'),
-                         u'/routed/string_view')

tests/urls.py

@@ -9,8 +9,6 @@
 
     url(U / 'included', view_include(included_views)),
     url(U / 'included', view_include(included_views, namespace='named')),
-    url(U / 'string', view_include('tests.included_app.views',
-                                   namespace='string_import')),
     url(U, view_include(included_views, namespace='wild_card')),
     routed_views.include(U / 'routed', namespace='routed'),
 ]

urljects/routemap.py

@@ -12,10 +12,9 @@ class RouteMap(object):
 
     def __init__(self):
         self.routes = []
-        self.default_prefix = ''
 
     def __call__(self, url_pattern, view=None, name=None, priority=0,
-                 prefix=None, kwargs=None):
+                 kwargs=None):
         """
         Register a URL -> view mapping, or return a registering decorator
 
@@ -26,19 +25,15 @@ def __call__(self, url_pattern, view=None, name=None, priority=0,
 
         :param name: name of the view; resolve_name() will be used otherwise.
         :param priority: priority for sorting; pass e.g. -1 for catch-all route
-        :param prefix: passed to url()
-        :param kwargs: passed to url()
         """
-        if prefix is None:
-            prefix = self.default_prefix
 
         def router_decorator(view):
             if name is None:
                 resolved_name = resolve_name(view)
             else:
                 resolved_name = name
             url_object = url(url_pattern, view, kwargs=kwargs,
-                             name=resolved_name, prefix=prefix)
+                             name=resolved_name)
             self.routes.append((priority, url_object))
             return view
 

urljects/urljects.py

@@ -27,7 +27,7 @@ def url_view(url_pattern, name=None, priority=None):
     Meta decorator syntax has to be used in order to accept arguments.
 
     This decorator does not really do anything that magical:
-    
+
     This:
     >>> from urljects import U, url_view
     >>> @url_view(U / 'my_view')
@@ -78,7 +78,7 @@ def resolve_name(view):
     return None
 
 
-def url(url_pattern, view, kwargs=None, name=None, prefix=''):
+def url(url_pattern, view, kwargs=None, name=None):
     """
     This is replacement for ``django.conf.urls.url`` function.
     This url auto calls ``as_view`` method for Class based views and resolves
@@ -109,7 +109,7 @@ def url(url_pattern, view, kwargs=None, name=None, prefix=''):
         view=view,
         kwargs=kwargs,
         name=name,
-        prefix=prefix)
+        )
 
 
 def view_include(view_module, namespace=None, app_name=None):