Mercurial > cpython-lru_cache-weakref

changeset 58635:c7dcbd65c213 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 77900 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77900 | martin.v.loewis | 2010-02-01 02:18:51 +0100 (Mo, 01 Feb 2010) | 24 lines 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() ........ ................ ................
author Martin v. Löwis <martin@v.loewis.de>
date Mon, 01 Feb 2010 01:20:16 +0000
parents d887db501a22
children df2b9a6d28ae
files Lib/lib2to3/fixes/fix_import.py Lib/lib2to3/fixes/fix_itertools_imports.py Lib/lib2to3/fixes/fix_metaclass.py Lib/lib2to3/fixes/fix_tuple_params.py Lib/lib2to3/fixes/fix_xrange.py
diffstat 5 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Lib/lib2to3/fixes/fix_import.py	Sun Jan 31 23:20:26 2010 +0000
+++ b/Lib/lib2to3/fixes/fix_import.py	Mon Feb 01 01:20:16 2010 +0000
@@ -56,7 +56,6 @@
             if self.probably_a_local_import(imp.value):
                 imp.value = "." + imp.value
                 imp.changed()
-                return node
         else:
             have_local = False
             have_absolute = False
--- a/Lib/lib2to3/fixes/fix_itertools_imports.py	Sun Jan 31 23:20:26 2010 +0000
+++ b/Lib/lib2to3/fixes/fix_itertools_imports.py	Mon Feb 01 01:20:16 2010 +0000
@@ -49,4 +49,4 @@
             p = node.prefix
             node = BlankLine()
             node.prefix = p
-        return node
+            return node
--- a/Lib/lib2to3/fixes/fix_metaclass.py	Sun Jan 31 23:20:26 2010 +0000
+++ b/Lib/lib2to3/fixes/fix_metaclass.py	Mon Feb 01 01:20:16 2010 +0000
@@ -150,7 +150,7 @@
 
     def transform(self, node, results):
         if not has_metaclass(node):
-            return node
+            return
 
         fixup_parse_tree(node)
 
--- a/Lib/lib2to3/fixes/fix_tuple_params.py	Sun Jan 31 23:20:26 2010 +0000
+++ b/Lib/lib2to3/fixes/fix_tuple_params.py	Mon Feb 01 01:20:16 2010 +0000
@@ -81,7 +81,7 @@
                     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
--- a/Lib/lib2to3/fixes/fix_xrange.py	Sun Jan 31 23:20:26 2010 +0000
+++ b/Lib/lib2to3/fixes/fix_xrange.py	Mon Feb 01 01:20:16 2010 +0000
@@ -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)