summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-02-01 01:17:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-02-01 01:17:43 (GMT)
commitc0098595db55731f3c3ff8a17b5199e5e6b0e14d (patch)
tree2f2153b54f3de038c1afc4caa29fc4388122374c
parentd85f1c01afebd1db5d9400ba83b6d90e0819ce79 (diff)
downloadcpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.zip
cpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.tar.gz
cpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.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.py1
-rw-r--r--Lib/lib2to3/fixes/fix_itertools_imports.py2
-rw-r--r--Lib/lib2to3/fixes/fix_metaclass.py2
-rw-r--r--Lib/lib2to3/fixes/fix_tuple_params.py2
-rw-r--r--Lib/lib2to3/fixes/fix_xrange.py1
5 files changed, 3 insertions, 5 deletions
diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 4c75133..935f316 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 cbabfee..44dd82b 100644
--- 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 b508f5f..123268e 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 fb29f5c..21379ec 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 ca8f21a..a63af34 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)