diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-05-24 13:47:40 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-05-24 13:51:18 +0200 |
| commit | 2daf1ae8b9676c809ed948202cbd7bec4dd62740 (patch) | |
| tree | d1eb2c85267a12815e7491d437f00e2a45477b2c | |
| parent | 1e6c3368f2517f32b0651d68277ea8c9ef81d9b2 (diff) | |
Stopped converting match dict keys to bytestrings when resolving URLs.
Test suite is passing, but if any regression would be detected,
we might replace smart_str by force_unicode.
| -rw-r--r-- | django/core/urlresolvers.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index aadd290c33..78ce00511c 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -306,10 +306,8 @@ class RegexURLResolver(LocaleRegexProvider): tried.append([pattern]) else: if sub_match: - sub_match_dict = dict([(smart_str(k), v) for k, v in match.groupdict().items()]) - sub_match_dict.update(self.default_kwargs) - for k, v in sub_match.kwargs.iteritems(): - sub_match_dict[smart_str(k)] = v + sub_match_dict = dict(match.groupdict(), **self.default_kwargs) + sub_match_dict.update(sub_match.kwargs) return ResolverMatch(sub_match.func, sub_match.args, sub_match_dict, sub_match.url_name, self.app_name or sub_match.app_name, [self.namespace] + sub_match.namespaces) tried.append([pattern]) raise Resolver404({'tried': tried, 'path': new_path}) |
