diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-09 01:01:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-09 01:01:14 (GMT) |
| commit | 84ad84e0bb15e7c64109e88060afdcb60ae7b740 (patch) | |
| tree | 5469c776c1f0fd812ae194e39544fca7dd3130b9 /Lib/lib2to3/fixes/fix_dict.py | |
| parent | 5edb1a1b0add465bae25121ee4278a9ec6009005 (diff) | |
| download | cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.zip cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.tar.gz cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.tar.bz2 | |
Merged revisions 72491-72493 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r72491 | benjamin.peterson | 2009-05-08 19:33:27 -0500 (Fri, 08 May 2009) | 7 lines
make 2to3 use unicode internally on 2.x
This started out as a fix for #2660, but became this large refactoring
when I realized the dire state this was in. 2to3 now uses
tokenize.detect_encoding to decode the files correctly into unicode.
........
r72492 | benjamin.peterson | 2009-05-08 19:35:38 -0500 (Fri, 08 May 2009) | 1 line
remove compat code
........
r72493 | benjamin.peterson | 2009-05-08 19:54:15 -0500 (Fri, 08 May 2009) | 1 line
add a test for \r\n newlines
........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_dict.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_dict.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/lib2to3/fixes/fix_dict.py b/Lib/lib2to3/fixes/fix_dict.py index dec94c5..b0b9de0 100644 --- a/Lib/lib2to3/fixes/fix_dict.py +++ b/Lib/lib2to3/fixes/fix_dict.py @@ -51,7 +51,7 @@ class FixDict(fixer_base.BaseFix): tail = results["tail"] syms = self.syms method_name = method.value - isiter = method_name.startswith("iter") + isiter = method_name.startswith(u"iter") if isiter: method_name = method_name[4:] assert method_name in ("keys", "items", "values"), repr(method) @@ -65,8 +65,8 @@ class FixDict(fixer_base.BaseFix): results["parens"].clone()] new = pytree.Node(syms.power, args) if not special: - new.set_prefix("") - new = Call(Name(isiter and "iter" or "list"), [new]) + new.set_prefix(u"") + new = Call(Name(isiter and u"iter" or u"list"), [new]) if tail: new = pytree.Node(syms.power, [new] + tail) new.set_prefix(node.get_prefix()) |