mirror of
https://github.com/python/cpython.git
synced 2025-08-03 00:23:06 +00:00
Merged revisions 66174-66175,66177 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ................ r66174 | benjamin.peterson | 2008-09-02 19:21:32 -0500 (Tue, 02 Sep 2008) | 15 lines Merged revisions 66173 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66173 | benjamin.peterson | 2008-09-02 18:57:48 -0500 (Tue, 02 Sep 2008) | 8 lines A little 2to3 refactoring #3637 This moves command line logic from refactor.py to a new file called main.py. RefactoringTool now merely deals with the actual fixers and refactoring; options processing for example is abstracted out. This patch was reviewed by Gregory P. Smith. ........ ................ r66175 | benjamin.peterson | 2008-09-02 20:53:28 -0500 (Tue, 02 Sep 2008) | 1 line update 2to3 script from 2to3 trunk ................ r66177 | benjamin.peterson | 2008-09-02 21:14:03 -0500 (Tue, 02 Sep 2008) | 9 lines Merged revisions 66176 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66176 | benjamin.peterson | 2008-09-02 21:04:06 -0500 (Tue, 02 Sep 2008) | 1 line fix typo ........ ................
This commit is contained in:
parent
d8976f12d4
commit
8951b6172c
8 changed files with 217 additions and 172 deletions
|
@ -21,19 +21,12 @@ from .. import refactor
|
|||
from .. import fixer_util
|
||||
|
||||
|
||||
class Options:
|
||||
def __init__(self, **kwargs):
|
||||
for k, v in list(kwargs.items()):
|
||||
setattr(self, k, v)
|
||||
|
||||
self.verbose = False
|
||||
|
||||
class FixerTestCase(support.TestCase):
|
||||
def setUp(self, fix_list=None):
|
||||
if not fix_list:
|
||||
if fix_list is None:
|
||||
fix_list = [self.fixer]
|
||||
options = Options(fix=fix_list, print_function=False)
|
||||
self.refactor = refactor.RefactoringTool("lib2to3/fixes", options)
|
||||
options = {"print_function" : False}
|
||||
self.refactor = support.get_refactorer(fix_list, options)
|
||||
self.fixer_log = []
|
||||
self.filename = "<string>"
|
||||
|
||||
|
@ -70,10 +63,10 @@ class FixerTestCase(support.TestCase):
|
|||
self.failUnlessEqual(self.fixer_log, [])
|
||||
|
||||
def assert_runs_after(self, *names):
|
||||
fix = [self.fixer]
|
||||
fix.extend(names)
|
||||
options = Options(fix=fix, print_function=False)
|
||||
r = refactor.RefactoringTool("lib2to3/fixes", options)
|
||||
fixes = [self.fixer]
|
||||
fixes.extend(names)
|
||||
options = {"print_function" : False}
|
||||
r = support.get_refactorer(fixes, options)
|
||||
(pre, post) = r.get_fixers()
|
||||
n = "fix_" + self.fixer
|
||||
if post and post[-1].__class__.__module__.endswith(n):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue