diff options
| author | Dan Johnson <danj.py@gmail.com> | 2013-09-06 13:43:58 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-09-06 15:46:43 -0400 |
| commit | df462cf7604578c2afd43b988b7ea1fe5e727896 (patch) | |
| tree | 5e16f7aadf00e6c0a557d424255bd97ba775bcb5 /django | |
| parent | c7c19ac4080a533ef881b57e88e1efbc2882f7d2 (diff) | |
Fixed #21043 -- Made resolve() handle reverse_lazy objects.
Thanks Keryn Knight for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/urlresolvers.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index 1422bf7089..14fc282281 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -311,6 +311,7 @@ class RegexURLResolver(LocaleRegexProvider): return self._app_dict[language_code] def resolve(self, path): + path = force_text(path) # path may be a reverse_lazy object tried = [] match = self.regex.search(path) if match: |