From fb857a8cc5cfdd39ec11de54bb53d5952266b019 Mon Sep 17 00:00:00 2001
From: Alexey Evseev <myhappydo@gmail.com>
Date: Sun, 5 Feb 2017 00:13:35 +0300
Subject: [PATCH 1/2] Fix url resolver inheritance [refs #40]

---
 solid_i18n/urlresolvers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solid_i18n/urlresolvers.py b/solid_i18n/urlresolvers.py
index 57cbc4d..651d5a2 100644
--- a/solid_i18n/urlresolvers.py
+++ b/solid_i18n/urlresolvers.py
@@ -13,9 +13,9 @@ class SolidLocaleRegexURLResolver(LocaleRegexURLResolver):
     Rather than taking a regex argument, we just override the ``regex``
     function to always return the active language-code as regex.
     """
-    def __init__(self, urlconf_name, default_kwargs=None, app_name=None, namespace=None):
-        super(LocaleRegexURLResolver, self).__init__(
-            None, urlconf_name, default_kwargs, app_name, namespace)
+    def __init__(self, urlconf_name, *args, **kwargs):
+        super(SolidLocaleRegexURLResolver, self).__init__(
+            urlconf_name, *args, **kwargs)
         self.compiled_with_default = False
 
     @property

From 880181517ec6cc6361545bfa5a7726138ec89694 Mon Sep 17 00:00:00 2001
From: Alexey Evseev <myhappydo@gmail.com>
Date: Sun, 5 Feb 2017 00:23:47 +0300
Subject: [PATCH 2/2] Add Django 1.10 to travis

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 262f1c6..b3bc1bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,13 @@ python:
 env:
   - TOXENV=py34-django18
   - TOXENV=py34-django19
+  - TOXENV=py34-django110
   - TOXENV=py35-django18
   - TOXENV=py35-django19
+  - TOXENV=py35-django110
   - TOXENV=py27-django18
   - TOXENV=py27-django19
+  - TOXENV=py27-django110
 
 install: pip install --quiet tox
 
@@ -17,7 +20,7 @@ install: pip install --quiet tox
 script: tox
 
 after_script:
-    - if [ $TOXENV == "py27-django19" ]; then
+    - if [ $TOXENV == "py27-django110" ]; then
         pip install --quiet coveralls;
         coveralls;
       fi