mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 67183,67191,67371 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r67183 | benjamin.peterson | 2008-11-10 21:51:33 -0600 (Mon, 10 Nov 2008) | 1 line

  handle 'import x as y' in fix_imports; this still needs more work...
........
  r67191 | benjamin.peterson | 2008-11-11 17:24:51 -0600 (Tue, 11 Nov 2008) | 1 line

  super() is good
........
  r67371 | benjamin.peterson | 2008-11-24 16:02:00 -0600 (Mon, 24 Nov 2008) | 1 line

  don't blow up in the metaclass fixer when assignments in the class statement aren't simple
........
This commit is contained in:
Benjamin Peterson 2008-11-25 04:07:45 +00:00
parent 9e6310d936
commit b38e325e97
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/lib2to3/tests/test_fixers.py
View file

@ -2622,7 +2622,7 @@ class Test_map(FixerTestCase):
def check(self, b, a):
self.unchanged("from future_builtins import map; " + b, a)
FixerTestCase.check(self, b, a)
super(Test_map, self).check(b, a)
def test_prefix_preservation(self):
b = """x = map( f, 'abc' )"""
@ -2729,7 +2729,7 @@ class Test_zip(FixerTestCase):
def check(self, b, a):
self.unchanged("from future_builtins import zip; " + b, a)
FixerTestCase.check(self, b, a)
super(Test_zip, self).check(b, a)
def test_zip_basic(self):
b = """x = zip(a, b, c)"""
@ -3274,7 +3274,7 @@ class Test_import(FixerTestCase):
fixer = "import"
def setUp(self):
FixerTestCase.setUp(self)
super(Test_import, self).setUp()
# Need to replace fix_import's exists method
# so we can check that it's doing the right thing
self.files_checked = []
@ -3293,9 +3293,9 @@ class Test_import(FixerTestCase):
def check_both(self, b, a):
self.always_exists = True
FixerTestCase.check(self, b, a)
super(Test_import, self).check(b, a)
self.always_exists = False
FixerTestCase.unchanged(self, b)
super(Test_import, self).unchanged(b)
def test_files_checked(self):
def p(path):
@ -3372,6 +3372,11 @@ class Test_import(FixerTestCase):
a = "from . import foo, bar"
self.check_both(b, a)
def test_import_as(self):
b = "import foo as x"
a = "from . import foo as x"
self.check_both(b, a)
def test_dotted_import(self):
b = "import foo.bar"
a = "from . import foo.bar"
@ -3766,6 +3771,17 @@ class Test_metaclass(FixerTestCase):
"""
self.check(b, a)
b = """
class X:
__metaclass__ = Meta
save.py = 23
"""
a = """
class X(metaclass=Meta):
save.py = 23
"""
self.check(b, a)
class Test_getcwdu(FixerTestCase):