summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/fixes/fix_next.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-03-19 05:22:42 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-03-19 05:22:42 (GMT)
commitab41b370a3eb1444b8ada38311a1bb498575a81c (patch)
treeb22e09cdf2029c150bee013d8942df92f1a22250 /Lib/lib2to3/fixes/fix_next.py
parentaad2b61f441f4af66cb6bbdcc0d74092047816b2 (diff)
downloadcpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.zip
cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.gz
cpython-ab41b370a3eb1444b8ada38311a1bb498575a81c.tar.bz2
Merged revisions 61598-61599,61601 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line Added fixer for zip, and refactored a bit of code in the process. Closing #2171. ........ r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines Removed a bunch of duplicate code -- it's in util now. ........ r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines Fix whitespace. ........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_next.py')
-rw-r--r--Lib/lib2to3/fixes/fix_next.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/lib2to3/fixes/fix_next.py b/Lib/lib2to3/fixes/fix_next.py
index adbc962..6b54376 100644
--- a/Lib/lib2to3/fixes/fix_next.py
+++ b/Lib/lib2to3/fixes/fix_next.py
@@ -47,12 +47,12 @@ class FixNext(basefix.BaseFix):
mod = results.get("mod")
if base:
- if self.shadowed_next:
- attr.replace(Name("__next__", prefix=attr.get_prefix()))
- else:
- base = [n.clone() for n in base]
- base[0].set_prefix("")
- node.replace(Call(Name("next", prefix=node.get_prefix()), base))
+ if self.shadowed_next:
+ attr.replace(Name("__next__", prefix=attr.get_prefix()))
+ else:
+ base = [n.clone() for n in base]
+ base[0].set_prefix("")
+ node.replace(Call(Name("next", prefix=node.get_prefix()), base))
elif name:
n = Name("__next__", prefix=name.get_prefix())
name.replace(n)