[Python-checkins] r67384 - in sandbox/trunk/2to3/lib2to3: refactor.py tests/test_fixers.py
benjamin.peterson
python-checkins at python.org
Tue Nov 25 23:13:31 CET 2008
Author: benjamin.peterson
Date: Tue Nov 25 23:13:31 2008
New Revision: 67384
Log:
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
Modified:
sandbox/trunk/2to3/lib2to3/refactor.py
sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
Modified: sandbox/trunk/2to3/lib2to3/refactor.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/refactor.py (original)
+++ sandbox/trunk/2to3/lib2to3/refactor.py Tue Nov 25 23:13:31 2008
@@ -123,8 +123,8 @@
logger=self.logger)
self.pre_order, self.post_order = self.get_fixers()
- self.pre_order = get_headnode_dict(self.pre_order)
- self.post_order = get_headnode_dict(self.post_order)
+ self.pre_order_mapping = get_headnode_dict(self.pre_order)
+ self.post_order_mapping = get_headnode_dict(self.post_order)
self.files = [] # List of files that were or should be modified
@@ -290,13 +290,12 @@
# Two calls to chain are required because pre_order.values()
# will be a list of lists of fixers:
# [[<fixer ...>, <fixer ...>], [<fixer ...>]]
- all_fixers = chain(chain(*self.pre_order.values()),\
- chain(*self.post_order.values()))
+ all_fixers = chain(self.pre_order, self.post_order)
for fixer in all_fixers:
fixer.start_tree(tree, name)
- self.traverse_by(self.pre_order, tree.pre_order())
- self.traverse_by(self.post_order, tree.post_order())
+ self.traverse_by(self.pre_order_mapping, tree.pre_order())
+ self.traverse_by(self.post_order_mapping, tree.post_order())
for fixer in all_fixers:
fixer.finish_tree(tree, name)
Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py (original)
+++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Tue Nov 25 23:13:31 2008
@@ -30,10 +30,9 @@
self.fixer_log = []
self.filename = "<string>"
- for order in (self.refactor.pre_order.values(),\
- self.refactor.post_order.values()):
- for fixer in chain(*order):
- fixer.log = self.fixer_log
+ for fixer in chain(self.refactor.pre_order,
+ self.refactor.post_order):
+ fixer.log = self.fixer_log
def _check(self, before, after):
before = support.reformat(before)
More information about the Python-checkins
mailing list