Merge branch 'master' into pr315

examples/tenant_tutorial/tenant_tutorial/urls_public.py

@@ -1,6 +1,11 @@
-from django.conf.urls import patterns, url
+import django
+from django.conf.urls import url
 from tenant_tutorial.views import HomeView
 
-urlpatterns = patterns('',
-                       url(r'^$', HomeView.as_view()),
-                       )
+
+urlpatterns = [
+    url(r'^$', HomeView.as_view()),
+]
+
+if django.VERSION < (1, 9, 0):
+    urlpatterns = django.conf.urls.patterns('', *urlpatterns)

examples/tenant_tutorial/tenant_tutorial/urls_tenants.py

@@ -1,6 +1,11 @@
-from django.conf.urls import patterns, url
+import django
+from django.conf.urls import url
 from customers.views import TenantView
 
-urlpatterns = patterns('',
-                       url(r'^$', TenantView.as_view()),
-                       )
+
+urlpatterns = [
+    url(r'^$', TenantView.as_view()),
+]
+
+if django.VERSION < (1, 9, 0):
+    urlpatterns = django.conf.urls.patterns('', *urlpatterns)

tenant_schemas/urlresolvers.py

@@ -1,13 +1,17 @@
-import warnings
-from django.conf import settings
 from django.core.urlresolvers import reverse as reverse_default
 from django.utils.functional import lazy
 from tenant_schemas.utils import clean_tenant_url
 
 
 def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None,
             current_app=None):
-    url = reverse_default(viewname, urlconf, args, kwargs, prefix, current_app)
+    url = reverse_default(
+        viewname=viewname, 
+        urlconf=urlconf, 
+        args=args, 
+        kwargs=kwargs, 
+        current_app=current_app
+    )
     return clean_tenant_url(url)
 
 reverse_lazy = lazy(reverse, str)