summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/fixes
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-01 01:15:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-07-01 01:15:26 (GMT)
commit731371268e62608725267f127e228f777153fe49 (patch)
treeb9c9b81ca4018b5ada303a1f7acbc4a2e2cad771 /Lib/lib2to3/fixes
parent41a28734b41610c91cf3013b4af8ac490c94c801 (diff)
downloadcpython-731371268e62608725267f127e228f777153fe49.zip
cpython-731371268e62608725267f127e228f777153fe49.tar.gz
cpython-731371268e62608725267f127e228f777153fe49.tar.bz2
Merged revisions 73727 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73727 | benjamin.peterson | 2009-06-30 20:06:56 -0500 (Tue, 30 Jun 2009) | 28 lines 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.py2
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