Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 77855-77856,77870 via svnmerge from

Browse source 
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:
Martin v. Löwis 2010-02-01 01:15:39 +00:00
parent b4b0a2935d
commit 1595f9fe9b
5 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/lib2to3/fixes/fix_import.py
View file

@ -56,7 +56,6 @@ def transform(self, node, results):
if self.probably_a_local_import(imp.value): if self.probably_a_local_import(imp.value):
imp.value = u"." + imp.value imp.value = u"." + imp.value
imp.changed() imp.changed()
return node
else: else:
have_local = False have_local = False
have_absolute = False have_absolute = False

2
Lib/lib2to3/fixes/fix_itertools_imports.py
View file

@ -49,4 +49,4 @@ def transform(self, node, results):
p = node.prefix p = node.prefix
node = BlankLine() node = BlankLine()
node.prefix = p node.prefix = p
return node return node

2
Lib/lib2to3/fixes/fix_metaclass.py
View file

@ -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)

2
Lib/lib2to3/fixes/fix_tuple_params.py
View file

@ -81,7 +81,7 @@ def handle_tuple(tuple_arg, add_prefix=False):
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

1
Lib/lib2to3/fixes/fix_xrange.py
View file

@ -40,7 +40,6 @@ def transform_range(self, node, results):
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)