mirror of https://github.com/python/cpython
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() ........ ................
This commit is contained in:
parent
d85f1c01af
commit
c0098595db
|
@ -56,7 +56,6 @@ class FixImport(fixer_base.BaseFix):
|
||||||
if self.probably_a_local_import(imp.value):
|
if self.probably_a_local_import(imp.value):
|
||||||
imp.value = "." + imp.value
|
imp.value = "." + imp.value
|
||||||
imp.changed()
|
imp.changed()
|
||||||
return node
|
|
||||||
else:
|
else:
|
||||||
have_local = False
|
have_local = False
|
||||||
have_absolute = False
|
have_absolute = False
|
||||||
|
|
|
@ -42,4 +42,4 @@ class FixItertoolsImports(fixer_base.BaseFix):
|
||||||
p = node.get_prefix()
|
p = node.get_prefix()
|
||||||
node = BlankLine()
|
node = BlankLine()
|
||||||
node.prefix = p
|
node.prefix = p
|
||||||
return node
|
return node
|
||||||
|
|
|
@ -150,7 +150,7 @@ class FixMetaclass(fixer_base.BaseFix):
|
||||||
|
|
||||||
def transform(self, node, results):
|
def transform(self, node, results):
|
||||||
if not has_metaclass(node):
|
if not has_metaclass(node):
|
||||||
return node
|
return
|
||||||
|
|
||||||
fixup_parse_tree(node)
|
fixup_parse_tree(node)
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class FixTupleParams(fixer_base.BaseFix):
|
||||||
handle_tuple(arg, add_prefix=(i > 0))
|
handle_tuple(arg, add_prefix=(i > 0))
|
||||||
|
|
||||||
if not new_lines:
|
if not new_lines:
|
||||||
return node
|
return
|
||||||
|
|
||||||
# This isn't strictly necessary, but it plays nicely with other fixers.
|
# This isn't strictly necessary, but it plays nicely with other fixers.
|
||||||
# TODO(cwinter) get rid of this when children becomes a smart list
|
# TODO(cwinter) get rid of this when children becomes a smart list
|
||||||
|
|
|
@ -40,7 +40,6 @@ class FixXrange(fixer_base.BaseFix):
|
||||||
for n in results["rest"]:
|
for n in results["rest"]:
|
||||||
list_call.append_child(n)
|
list_call.append_child(n)
|
||||||
return list_call
|
return list_call
|
||||||
return node
|
|
||||||
|
|
||||||
P1 = "power< func=NAME trailer< '(' node=any ')' > any* >"
|
P1 = "power< func=NAME trailer< '(' node=any ')' > any* >"
|
||||||
p1 = patcomp.compile_pattern(P1)
|
p1 = patcomp.compile_pattern(P1)
|
||||||
|
|
Loading…
Reference in New Issue