mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Merged revisions 73370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r73370 | benjamin.peterson | 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) | 105 lines
Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r72523 | benjamin.peterson | 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) | 1 line
remove parenthesis
........
r72950 | benjamin.peterson | 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) | 1 line
remove unused imports
........
r72951 | benjamin.peterson | 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) | 1 line
this is no longer executable
........
r72994 | benjamin.peterson | 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) | 1 line
fix test_all_fixers on Windows #6134
........
r73003 | benjamin.peterson | 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) | 4 lines
make 2to3 test utilities easier to use with other applications (3to2)
Patch by Joe Amenta
........
r73033 | benjamin.peterson | 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) | 1 line
update grammar for multi with statement
........
r73036 | benjamin.peterson | 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) | 1 line
simplify fix_unicode
........
r73037 | benjamin.peterson | 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) | 1 line
add custom error for pattern syntax errors
........
r73038 | benjamin.peterson | 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) | 1 line
complain if details are attached to a token
........
r73039 | benjamin.peterson | 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) | 1 line
add a test for whitespace
........
r73040 | benjamin.peterson | 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) | 1 line
a fix for emacs highlighting
........
r73091 | benjamin.peterson | 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) | 1 line
deprecate set_prefix() and get_prefix() in favor of a prefix property
........
r73092 | benjamin.peterson | 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) | 1 line
change hideous java naming scheme
........
r73093 | benjamin.peterson | 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) | 1 line
remove dated comment
........
r73096 | benjamin.peterson | 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) | 1 line
group tests
........
r73179 | benjamin.peterson | 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) | 1 line
handle the case where there's multiple trailers #6185
........
r73180 | benjamin.peterson | 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) | 1 line
scrap __main__ section
........
r73181 | benjamin.peterson | 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) | 1 line
remove shebang lines and __main__ sections
........
r73192 | benjamin.peterson | 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) | 4 lines
actually test something here
Thanks to Joe Amenta for noticing.y
........
r73231 | benjamin.peterson | 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) | 1 line
remove unused variable
........
r73244 | benjamin.peterson | 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) | 1 line
allow fixers to give different options in setUp
........
r73255 | benjamin.peterson | 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) | 1 line
fix the except fixer on one line suites #6222
........
r73256 | benjamin.peterson | 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) | 1 line
test one-line else and finally clauses
........
r73365 | benjamin.peterson | 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) | 1 line
normalize whitespace
........
................
This commit is contained in:
Benjamin Peterson
parent
be40db07c6
commit
2c3ac6b875
64 changed files with 381 additions and 302 deletions
|
|
@ -1,12 +1,4 @@
|
|||
#!/usr/bin/env python2.5
|
||||
""" Test suite for the fixer modules """
|
||||
# Author: Collin Winter
|
||||
|
||||
# Testing imports
|
||||
try:
|
||||
from tests import support
|
||||
except ImportError:
|
||||
from . import support
|
||||
|
||||
# Python imports
|
||||
import os
|
||||
|
|
@ -16,14 +8,19 @@ from operator import itemgetter
|
|||
|
||||
# Local imports
|
||||
from lib2to3 import pygram, pytree, refactor, fixer_util
|
||||
from lib2to3.tests import support
|
||||
|
||||
|
||||
class FixerTestCase(support.TestCase):
|
||||
def setUp(self, fix_list=None):
|
||||
|
||||
# Other test cases can subclass this class and replace "fixer_pkg" with
|
||||
# their own.
|
||||
def setUp(self, fix_list=None, fixer_pkg="lib2to3", options=None):
|
||||
if fix_list is None:
|
||||
fix_list = [self.fixer]
|
||||
options = {"print_function" : False}
|
||||
self.refactor = support.get_refactorer(fix_list, options)
|
||||
if options is None:
|
||||
options = {"print_function" : False}
|
||||
self.refactor = support.get_refactorer(fixer_pkg, fix_list, options)
|
||||
self.fixer_log = []
|
||||
self.filename = "<string>"
|
||||
|
||||
|
|
@ -62,7 +59,7 @@ class FixerTestCase(support.TestCase):
|
|||
fixes = [self.fixer]
|
||||
fixes.extend(names)
|
||||
options = {"print_function" : False}
|
||||
r = support.get_refactorer(fixes, options)
|
||||
r = support.get_refactorer("lib2to3", fixes, options)
|
||||
(pre, post) = r.get_fixers()
|
||||
n = "fix_" + self.fixer
|
||||
if post and post[-1].__class__.__module__.endswith(n):
|
||||
|
|
@ -419,6 +416,7 @@ class Test_print(FixerTestCase):
|
|||
def test_5(self):
|
||||
b = """print; print whatever;"""
|
||||
a = """print(); print(whatever);"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_tuple(self):
|
||||
b = """print (a, b, c)"""
|
||||
|
|
@ -782,6 +780,52 @@ class Test_except(FixerTestCase):
|
|||
pass"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_one_line_suites(self):
|
||||
b = """
|
||||
try: raise TypeError
|
||||
except TypeError, e:
|
||||
pass
|
||||
"""
|
||||
a = """
|
||||
try: raise TypeError
|
||||
except TypeError as e:
|
||||
pass
|
||||
"""
|
||||
self.check(b, a)
|
||||
b = """
|
||||
try:
|
||||
raise TypeError
|
||||
except TypeError, e: pass
|
||||
"""
|
||||
a = """
|
||||
try:
|
||||
raise TypeError
|
||||
except TypeError as e: pass
|
||||
"""
|
||||
self.check(b, a)
|
||||
b = """
|
||||
try: raise TypeError
|
||||
except TypeError, e: pass
|
||||
"""
|
||||
a = """
|
||||
try: raise TypeError
|
||||
except TypeError as e: pass
|
||||
"""
|
||||
self.check(b, a)
|
||||
b = """
|
||||
try: raise TypeError
|
||||
except TypeError, e: pass
|
||||
else: function()
|
||||
finally: done()
|
||||
"""
|
||||
a = """
|
||||
try: raise TypeError
|
||||
except TypeError as e: pass
|
||||
else: function()
|
||||
finally: done()
|
||||
"""
|
||||
self.check(b, a)
|
||||
|
||||
# These should not be touched:
|
||||
|
||||
def test_unchanged_1(self):
|
||||
|
|
@ -2640,11 +2684,29 @@ class Test_renames(FixerTestCase):
|
|||
class Test_unicode(FixerTestCase):
|
||||
fixer = "unicode"
|
||||
|
||||
def test_whitespace(self):
|
||||
b = """unicode( x)"""
|
||||
a = """str( x)"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """ unicode(x )"""
|
||||
a = """ str(x )"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """ u'h'"""
|
||||
a = """ 'h'"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_unicode_call(self):
|
||||
b = """unicode(x, y, z)"""
|
||||
a = """str(x, y, z)"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_unichr(self):
|
||||
b = """unichr(u'h')"""
|
||||
a = """chr('h')"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_unicode_literal_1(self):
|
||||
b = '''u"x"'''
|
||||
a = '''"x"'''
|
||||
|
|
@ -2656,8 +2718,8 @@ class Test_unicode(FixerTestCase):
|
|||
self.check(b, a)
|
||||
|
||||
def test_unicode_literal_3(self):
|
||||
b = """UR'''x'''"""
|
||||
a = """R'''x'''"""
|
||||
b = """UR'''x''' """
|
||||
a = """R'''x''' """
|
||||
self.check(b, a)
|
||||
|
||||
class Test_callable(FixerTestCase):
|
||||
|
|
@ -3306,6 +3368,11 @@ class Test_buffer(FixerTestCase):
|
|||
a = """x = memoryview(y)"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_slicing(self):
|
||||
b = """buffer(y)[4:5]"""
|
||||
a = """memoryview(y)[4:5]"""
|
||||
self.check(b, a)
|
||||
|
||||
class Test_future(FixerTestCase):
|
||||
fixer = "future"
|
||||
|
||||
|
|
@ -4028,8 +4095,3 @@ class Test_getcwdu(FixerTestCase):
|
|||
b = """os.getcwdu ( )"""
|
||||
a = """os.getcwd ( )"""
|
||||
self.check(b, a)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import __main__
|
||||
support.run_all_tests(__main__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue