mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines Add import fixes for dbm package. ........ r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines Add xmlrpc package fixes. ........ r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines Add fixer entries for http package. ........ r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines add import mapping for test.test_support -> test.support ........ r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines mapping for commands module -> subprocess ........ r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line Fixer for UserString.UserString over to the collections module. ........ r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines Add a fixer for UserList. Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch. ........ r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines Move lib2to3/fixes/{basefix,util}.py down to lib2to3/. This is step 1 of turning lib2to3/ into a general-purpose refactoring library, reusable by other projects. ........ r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines Allow refactoring tools to specify a directory for fixer modules. This is step 2 of turning lib2to3/ into a general-purpose refactoring library, reusable by other projects. Step 1: r63880. ........
This commit is contained in:
parent
a0205d0a46
commit
e607823af5
46 changed files with 276 additions and 157 deletions
|
@ -10,13 +10,14 @@ except ImportError:
|
|||
|
||||
# Python imports
|
||||
import unittest
|
||||
from itertools import chain
|
||||
from os.path import dirname, pathsep
|
||||
|
||||
# Local imports
|
||||
from .. import pygram
|
||||
from .. import pytree
|
||||
from .. import refactor
|
||||
from ..fixes import util
|
||||
from .. import fixer_util
|
||||
|
||||
|
||||
class Options:
|
||||
|
@ -29,11 +30,10 @@ class Options:
|
|||
class FixerTestCase(support.TestCase):
|
||||
def setUp(self):
|
||||
options = Options(fix=[self.fixer], print_function=False)
|
||||
self.refactor = refactor.RefactoringTool(options)
|
||||
self.refactor = refactor.RefactoringTool("lib2to3/fixes", options)
|
||||
self.fixer_log = []
|
||||
self.filename = "<string>"
|
||||
|
||||
from itertools import chain
|
||||
for order in (self.refactor.pre_order.values(),\
|
||||
self.refactor.post_order.values()):
|
||||
for fixer in chain(*order):
|
||||
|
@ -70,7 +70,7 @@ class FixerTestCase(support.TestCase):
|
|||
fix = [self.fixer]
|
||||
fix.extend(names)
|
||||
options = Options(fix=fix, print_function=False)
|
||||
r = refactor.RefactoringTool(options)
|
||||
r = refactor.RefactoringTool("lib2to3/fixes", options)
|
||||
(pre, post) = r.get_fixers()
|
||||
n = "fix_" + self.fixer
|
||||
if post and post[-1].__class__.__module__.endswith(n):
|
||||
|
@ -1109,7 +1109,7 @@ class Test_dict(FixerTestCase):
|
|||
self.check(b, a)
|
||||
|
||||
def test_unchanged(self):
|
||||
for wrapper in util.consuming_calls:
|
||||
for wrapper in fixer_util.consuming_calls:
|
||||
s = "s = %s(d.keys())" % wrapper
|
||||
self.unchanged(s)
|
||||
|
||||
|
@ -1302,7 +1302,7 @@ class Test_xrange(FixerTestCase):
|
|||
self.unchanged("x in range(10, 3, 9)")
|
||||
|
||||
def test_in_consuming_context(self):
|
||||
for call in util.consuming_calls:
|
||||
for call in fixer_util.consuming_calls:
|
||||
self.unchanged("a = %s(range(10))" % call)
|
||||
|
||||
class Test_raw_input(FixerTestCase):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue