Merged revisions 61602 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61602 | martin.v.loewis | 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) | 17 lines
Merged revisions 61598-61599,61601 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line
Added fixer for zip, and refactored a bit of code in the process. Closing #2171.
........
r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines
Removed a bunch of duplicate code -- it's in util now.
........
r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines
Fix whitespace.
........
................
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index f7a3b15..0961e90 100755
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -118,7 +118,7 @@
def get_fixers(self):
"""Inspects the options to load the requested patterns and handlers.
-
+
Returns:
(pre_order, post_order), where pre_order is the list of fixers that
want a pre-order AST traversal, and post_order is the list that want
@@ -232,11 +232,11 @@
def refactor_string(self, data, name):
"""Refactor a given input string.
-
+
Args:
data: a string holding the code to be refactored.
name: a human-readable name for use in error/log messages.
-
+
Returns:
An AST corresponding to the refactored input stream; None if
there were errors during the parse.
@@ -274,12 +274,12 @@
def refactor_tree(self, tree, name):
"""Refactors a parse tree (modifying the tree in place).
-
+
Args:
tree: a pytree.Node instance representing the root of the tree
to be refactored.
name: a human-readable name for this tree.
-
+
Returns:
True if the tree was modified, False otherwise.
"""
@@ -296,13 +296,13 @@
def traverse_by(self, fixers, traversal):
"""Traverse an AST, applying a set of fixers to each node.
-
+
This is a helper method for refactor_tree().
-
+
Args:
fixers: a list of fixer instances.
traversal: a generator that yields AST nodes.
-
+
Returns:
None
"""
@@ -523,4 +523,4 @@
if __name__ == "__main__":
- sys.exit(main())
+ sys.exit(main())