[Python-checkins] r77870 - in sandbox/trunk/2to3/lib2to3/fixes: fix_import.py fix_itertools_imports.py fix_xrange.py

benjamin.peterson python-checkins at python.org
Sun Jan 31 02:21:27 CET 2010


Author: benjamin.peterson
Date: Sun Jan 31 02:21:26 2010
New Revision: 77870

Log:
never return the original node given to transform()

Modified:
   sandbox/trunk/2to3/lib2to3/fixes/fix_import.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_import.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_import.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_import.py	Sun Jan 31 02:21:26 2010
@@ -56,7 +56,6 @@
             if self.probably_a_local_import(imp.value):
                 imp.value = u"." + imp.value
                 imp.changed()
-                return node
         else:
             have_local = False
             have_absolute = False

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_itertools_imports.py	Sun Jan 31 02:21:26 2010
@@ -49,4 +49,4 @@
             p = node.prefix
             node = BlankLine()
             node.prefix = p
-        return node
+            return node

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_xrange.py	Sun Jan 31 02:21:26 2010
@@ -40,7 +40,6 @@
             for n in results["rest"]:
                 list_call.append_child(n)
             return list_call
-        return node
 
     P1 = "power< func=NAME trailer< '(' node=any ')' > any* >"
     p1 = patcomp.compile_pattern(P1)


More information about the Python-checkins mailing list