Skip to content
This repository has been archived by the owner on Jun 13, 2020. It is now read-only.

Commit

Permalink
Stopped converting match dict keys to bytestrings when resolving URLs.
Browse files Browse the repository at this point in the history
Test suite is passing, but if any regression would be detected,
we might replace smart_str by force_unicode.
  • Loading branch information
claudep committed May 24, 2012
1 parent 1e6c336 commit 2daf1ae
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions django/core/urlresolvers.py
Expand Up @@ -306,10 +306,8 @@ def resolve(self, path):
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})
Expand Down

0 comments on commit 2daf1ae

Please sign in to comment.