Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was…

… even

demonstrated by existing tests, so I really screwed this up).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cc1a4f031c5cefa15bb06986254e696ad5734fbb 1 parent 0927ab9
@malcolmt malcolmt authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  django/core/urlresolvers.py
View
3  django/core/urlresolvers.py
@@ -231,7 +231,8 @@ def resolve(self, path):
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)
- sub_match_dict.update([(smart_str(k), v) for k, v in sub_match[2].items()])
+ for k, v in sub_match[2].iteritems():
+ sub_match_dict[smart_str(k)] = v
return sub_match[0], sub_match[1], sub_match_dict
tried.append(pattern.regex.pattern)
raise Resolver404, {'tried': tried, 'path': new_path}
Please sign in to comment.
Something went wrong with that request. Please try again.