Django

Code

Changeset 5641

Show
Ignore:
Timestamp:
07/10/07 07:02:06 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was even
demonstrated by existing tests, so I really screwed this up).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/urlresolvers.py

    r5636 r5641  
    232232                        sub_match_dict = dict([(smart_str(k), v) for k, v in match.groupdict().items()]) 
    233233                        sub_match_dict.update(self.default_kwargs) 
    234                         sub_match_dict.update([(smart_str(k), v) for k, v in sub_match[2].items()]) 
     234                        for k, v in sub_match[2].iteritems(): 
     235                            sub_match_dict[smart_str(k)] = v 
    235236                        return sub_match[0], sub_match[1], sub_match_dict 
    236237                    tried.append(pattern.regex.pattern)