diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-02-01 01:18:51 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-02-01 01:18:51 (GMT) |
| commit | b1f7b7bef58a2e60eeb61180b400e13f487e139f (patch) | |
| tree | b8ef825a7acc189dc5fa9a5d64e614693520fbf7 | |
| parent | b3d77007f4e682c77c0c11439fc9d333a23d7f8b (diff) | |
| download | cpython-b1f7b7bef58a2e60eeb61180b400e13f487e139f.zip cpython-b1f7b7bef58a2e60eeb61180b400e13f487e139f.tar.gz cpython-b1f7b7bef58a2e60eeb61180b400e13f487e139f.tar.bz2 | |
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()
........
................
| -rw-r--r-- | Lib/lib2to3/fixes/fix_import.py | 1 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_itertools_imports.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_metaclass.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_tuple_params.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_xrange.py | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py index 998fe61..625611d 100644 --- 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 4849dd2..1897e36 100644 --- a/Lib/lib2to3/fixes/fix_itertools_imports.py +++ b/Lib/lib2to3/fixes/fix_itertools_imports.py @@ -49,4 +49,4 @@ class FixItertoolsImports(fixer_base.BaseFix): p = node.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 f7840d4..0116696 100644 --- 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 fb47d01..2085935 100644 --- 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 677556b..7efeea4 100644 --- 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) |