diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-07-01 01:06:56 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-07-01 01:06:56 (GMT) |
commit | 286a0d2ff7b04474dca7e30b3612ae699db5234a (patch) | |
tree | 0fea9905117d312e9b33027895e7db79b2a40236 /Lib/lib2to3/fixes | |
parent | a4aba66ebe630b272a5dca9569a38e4f006f23e3 (diff) | |
download | cpython-286a0d2ff7b04474dca7e30b3612ae699db5234a.zip cpython-286a0d2ff7b04474dca7e30b3612ae699db5234a.tar.gz cpython-286a0d2ff7b04474dca7e30b3612ae699db5234a.tar.bz2 |
Merged revisions 73725 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r73725 | benjamin.peterson | 2009-06-30 19:49:09 -0500 (Tue, 30 Jun 2009) | 21 lines
Merged revisions 73379,73388,73507,73722 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r73379 | benjamin.peterson | 2009-06-11 18:06:21 -0500 (Thu, 11 Jun 2009) | 1 line
use a real conditional expresion
........
r73388 | benjamin.peterson | 2009-06-12 09:44:29 -0500 (Fri, 12 Jun 2009) | 1 line
fix typo in last fix
........
r73507 | benjamin.peterson | 2009-06-22 13:32:04 -0500 (Mon, 22 Jun 2009) | 1 line
remove svn:executable property
........
r73722 | benjamin.peterson | 2009-06-30 19:44:30 -0500 (Tue, 30 Jun 2009) | 1 line
replace fail* with assert*
........
................
Diffstat (limited to 'Lib/lib2to3/fixes')
-rw-r--r-- | Lib/lib2to3/fixes/fix_dict.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_dict.py b/Lib/lib2to3/fixes/fix_dict.py index ce973fd..7c37fad 100644 --- a/Lib/lib2to3/fixes/fix_dict.py +++ b/Lib/lib2to3/fixes/fix_dict.py @@ -66,7 +66,7 @@ class FixDict(fixer_base.BaseFix): new = pytree.Node(syms.power, args) if not special: new.prefix = "" - new = Call(Name(isiter and "iter" or "list"), [new]) + new = Call(Name("iter" if isiter else "list"), [new]) if tail: new = pytree.Node(syms.power, [new] + tail) new.prefix = node.prefix |