Merged revisions 77898 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

................
  r77898 | martin.v.loewis | 2010-02-01 02:15:39 +0100 (Mo, 01 Feb 2010) | 17 lines

  Merged revisions 77855-77856,77870 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r77855 | benjamin.peterson | 2010-01-30 17:32:05 +0100 (Sa, 30 Jan 2010) | 1 line

    don't return node if it is not changed
  ........
    r77856 | benjamin.peterson | 2010-01-30 17:35:29 +0100 (Sa, 30 Jan 2010) | 1 line

    return None to indicate no change
  ........
    r77870 | benjamin.peterson | 2010-01-31 02:21:26 +0100 (So, 31 Jan 2010) | 1 line

    never return the original node given to transform()
  ........
................

diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 4c751337dc45bfd805f46c7f91bf355b82e47819..935f316dd2d45340b444917de0fb12bd6e2ae340 100644 (file)
--- a/Lib/lib2to3/fixes/fix_import.py
+++ b/Lib/lib2to3/fixes/fix_import.py
@@ -56,7 +56,6 @@ class FixImport(fixer_base.BaseFix):
             if self.probably_a_local_import(imp.value):
                 imp.value = "." + imp.value
                 imp.changed()
-                return node
         else:
             have_local = False
             have_absolute = False

diff --git a/Lib/lib2to3/fixes/fix_itertools_imports.py b/Lib/lib2to3/fixes/fix_itertools_imports.py
index cbabfee386ef11910a1a14be3ec22090caf618f4..44dd82b74c2660477b8bd4b6760da76758974c2d 100644 (file)
--- a/Lib/lib2to3/fixes/fix_itertools_imports.py
+++ b/Lib/lib2to3/fixes/fix_itertools_imports.py
@@ -42,4 +42,4 @@ class FixItertoolsImports(fixer_base.BaseFix):
             p = node.get_prefix()
             node = BlankLine()
             node.prefix = p
-        return node
+            return node

diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py
index b508f5f3809f5a49018099fdb9de7a1f3b7d5460..123268e9176fdc857989a8f33fa399593baa3b0b 100644 (file)
--- a/Lib/lib2to3/fixes/fix_metaclass.py
+++ b/Lib/lib2to3/fixes/fix_metaclass.py
@@ -150,7 +150,7 @@ class FixMetaclass(fixer_base.BaseFix):
 
     def transform(self, node, results):
         if not has_metaclass(node):
-            return node
+            return
 
         fixup_parse_tree(node)
 

diff --git a/Lib/lib2to3/fixes/fix_tuple_params.py b/Lib/lib2to3/fixes/fix_tuple_params.py
index fb29f5c95d0859246dfecdf0860d847b990b5fa1..21379ecb4d97b89749bfd4b3d45e13cbe8454e48 100644 (file)
--- a/Lib/lib2to3/fixes/fix_tuple_params.py
+++ b/Lib/lib2to3/fixes/fix_tuple_params.py
@@ -81,7 +81,7 @@ class FixTupleParams(fixer_base.BaseFix):
                     handle_tuple(arg, add_prefix=(i > 0))
 
         if not new_lines:
-            return node
+            return
 
         # This isn't strictly necessary, but it plays nicely with other fixers.
         # TODO(cwinter) get rid of this when children becomes a smart list

diff --git a/Lib/lib2to3/fixes/fix_xrange.py b/Lib/lib2to3/fixes/fix_xrange.py
index ca8f21ad2e1864935a8492462a8b9b94b29e971d..a63af34f0a47e0d2e4261ee89377e634ee87f283 100644 (file)
--- a/Lib/lib2to3/fixes/fix_xrange.py
+++ b/Lib/lib2to3/fixes/fix_xrange.py
@@ -40,7 +40,6 @@ class FixXrange(fixer_base.BaseFix):
             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)