Skip to content

Commit

Permalink
Merge pull request #41 from st4lk/issue-40-resolver-error
Browse files Browse the repository at this point in the history
Fix url resolver inheritance [refs #40]
  • Loading branch information
st4lk authored Feb 4, 2017
2 parents a8adba8 + 8801815 commit eae0d5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@ 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

# command to run tests
script: tox

after_script:
- if [ $TOXENV == "py27-django19" ]; then
- if [ $TOXENV == "py27-django110" ]; then
pip install --quiet coveralls;
coveralls;
fi
Expand Down
6 changes: 3 additions & 3 deletions solid_i18n/urlresolvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eae0d5d

Please sign in to comment.