mirror of
https://github.com/python/cpython.git
synced 2026-04-28 06:41:01 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk ................ r66801 | andrew.kuchling | 2008-10-04 23:51:59 +0200 (Sat, 04 Oct 2008) | 1 line Punctuation fix; expand dict.update docstring to be clearer ................ r66803 | benjamin.peterson | 2008-10-05 00:15:31 +0200 (Sun, 05 Oct 2008) | 1 line fix typo ................ r66804 | andrew.kuchling | 2008-10-05 02:11:56 +0200 (Sun, 05 Oct 2008) | 1 line #1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args() ................ r66813 | andrew.kuchling | 2008-10-06 14:07:04 +0200 (Mon, 06 Oct 2008) | 3 lines Per Greg Ward, optparse is no longer being externally maintained. I'll look at the bugs in the Optik bug tracker and copy them to the Python bug tracker if they're still relevant. ................ r66854 | georg.brandl | 2008-10-08 19:20:20 +0200 (Wed, 08 Oct 2008) | 2 lines #4059: patch up some sqlite docs. ................ r66855 | georg.brandl | 2008-10-08 19:30:55 +0200 (Wed, 08 Oct 2008) | 2 lines #4058: fix some whatsnew markup. ................ r66856 | georg.brandl | 2008-10-08 20:47:17 +0200 (Wed, 08 Oct 2008) | 3 lines #3935: properly support list subclasses in the C impl. of bisect. Patch reviewed by Raymond. ................ r66866 | benjamin.peterson | 2008-10-09 22:54:43 +0200 (Thu, 09 Oct 2008) | 1 line update paragraph about __future__ for 2.6 ................ r66870 | armin.rigo | 2008-10-10 10:40:44 +0200 (Fri, 10 Oct 2008) | 2 lines Typo: "ThreadError" is the name in the C source. ................ r66871 | benjamin.peterson | 2008-10-10 22:38:49 +0200 (Fri, 10 Oct 2008) | 1 line fix a small typo ................ r66872 | benjamin.peterson | 2008-10-10 22:51:37 +0200 (Fri, 10 Oct 2008) | 1 line talk about how you can unzip with zip ................ r66874 | benjamin.peterson | 2008-10-11 00:23:41 +0200 (Sat, 11 Oct 2008) | 1 line PyGILState_Acquire -> PyGILState_Ensure ................ r66887 | benjamin.peterson | 2008-10-13 23:51:40 +0200 (Mon, 13 Oct 2008) | 1 line document how to disable fixers ................ r66903 | benjamin.peterson | 2008-10-15 22:34:09 +0200 (Wed, 15 Oct 2008) | 1 line don't recurse into directories that start with '.' ................ r66905 | benjamin.peterson | 2008-10-15 23:05:55 +0200 (Wed, 15 Oct 2008) | 1 line support the optional line argument for idle ................ r66911 | benjamin.peterson | 2008-10-16 01:10:28 +0200 (Thu, 16 Oct 2008) | 41 lines Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line mention what the fixes directory is for ........ r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line use assertFalse and assertTrue ........ r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line instead of abusing the pattern matcher, use start_tree to find a next binding ........ r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line don't print tokens to stdout when -v is given ........ r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line add the -x option to disable fixers ........ r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line cut down on some crud ........ r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line add an optional set literal fixer ........ r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line don't write backup files by default ........ r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line add the -n option; it stops backupfiles from being written ........ ................ r66913 | benjamin.peterson | 2008-10-16 20:52:14 +0200 (Thu, 16 Oct 2008) | 1 line document that deque indexing is O(n) #4123 ................ r66927 | andrew.kuchling | 2008-10-16 22:15:47 +0200 (Thu, 16 Oct 2008) | 1 line Fix wording (2.6.1 backport candidate) ................ r66932 | benjamin.peterson | 2008-10-16 23:09:28 +0200 (Thu, 16 Oct 2008) | 1 line check for error conditions in _json #3623 ................ r66938 | benjamin.peterson | 2008-10-16 23:27:54 +0200 (Thu, 16 Oct 2008) | 1 line fix possible ref leak ................ r66942 | benjamin.peterson | 2008-10-16 23:48:06 +0200 (Thu, 16 Oct 2008) | 1 line fix more possible ref leaks in _json and use Py_CLEAR ................ r66962 | benjamin.peterson | 2008-10-17 22:01:01 +0200 (Fri, 17 Oct 2008) | 1 line clarify CALL_FUNCTION #4141 ................ r66964 | georg.brandl | 2008-10-17 23:41:49 +0200 (Fri, 17 Oct 2008) | 2 lines Fix duplicate word. ................ r66973 | armin.ronacher | 2008-10-19 10:27:43 +0200 (Sun, 19 Oct 2008) | 3 lines Fixed #4067 by implementing _attributes and _fields for the AST root node. ................ r66974 | benjamin.peterson | 2008-10-19 15:59:01 +0200 (Sun, 19 Oct 2008) | 1 line fix compiler warning ................ r66977 | benjamin.peterson | 2008-10-19 21:39:16 +0200 (Sun, 19 Oct 2008) | 1 line mention -n ................ r66992 | benjamin.peterson | 2008-10-21 22:51:13 +0200 (Tue, 21 Oct 2008) | 1 line make sure to call iteritems() ................ r66998 | benjamin.peterson | 2008-10-22 22:57:43 +0200 (Wed, 22 Oct 2008) | 1 line fix a few typos ................ r66999 | benjamin.peterson | 2008-10-22 23:05:30 +0200 (Wed, 22 Oct 2008) | 1 line and another typo... ................ r67002 | hirokazu.yamamoto | 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) | 1 line Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL. ................ r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) | 2 lines Use the correct names of the stateless codec functions (Fixes issue 4178). ................ r67007 | benjamin.peterson | 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) | 1 line only nonempty __slots__ don't work ................ r67028 | benjamin.peterson | 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) | 1 line don't use a catch-all ................ r67040 | armin.rigo | 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) | 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ................ r67041 | benjamin.peterson | 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) | 1 line mention the version gettempdir() was added ................ r67044 | amaury.forgeotdarc | 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) | 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ................ r67070 | benjamin.peterson | 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) | 1 line rephrase has_key doc ................ r67089 | benjamin.peterson | 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) | 1 line clarify by splitting into multiple paragraphs ................ r67091 | benjamin.peterson | 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) | 1 line move a FileIO test to test_fileio ................ r67101 | georg.brandl | 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) | 2 lines #4167: fix markup glitches. ................ r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines #4268: Use correct module for two toplevel functions. ................ r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines #4267: small fixes in sqlite3 docs. ................ r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines #4245: move Thread section to the top. ................ r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines #4247: add "pass" examples to tutorial. ................ r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line Fix grammar error; reword two paragraphs ................
168 lines
5.1 KiB
Python
168 lines
5.1 KiB
Python
"""
|
|
Unit tests for refactor.py.
|
|
"""
|
|
|
|
import sys
|
|
import os
|
|
import operator
|
|
import StringIO
|
|
import tempfile
|
|
import unittest
|
|
|
|
from lib2to3 import refactor, pygram, fixer_base
|
|
|
|
from . import support
|
|
|
|
|
|
FIXER_DIR = os.path.join(os.path.dirname(__file__), "data/fixers")
|
|
|
|
sys.path.append(FIXER_DIR)
|
|
try:
|
|
_DEFAULT_FIXERS = refactor.get_fixers_from_package("myfixes")
|
|
finally:
|
|
sys.path.pop()
|
|
|
|
class TestRefactoringTool(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
sys.path.append(FIXER_DIR)
|
|
|
|
def tearDown(self):
|
|
sys.path.pop()
|
|
|
|
def check_instances(self, instances, classes):
|
|
for inst, cls in zip(instances, classes):
|
|
if not isinstance(inst, cls):
|
|
self.fail("%s are not instances of %s" % instances, classes)
|
|
|
|
def rt(self, options=None, fixers=_DEFAULT_FIXERS, explicit=None):
|
|
return refactor.RefactoringTool(fixers, options, explicit)
|
|
|
|
def test_print_function_option(self):
|
|
gram = pygram.python_grammar
|
|
save = gram.keywords["print"]
|
|
try:
|
|
rt = self.rt({"print_function" : True})
|
|
self.assertRaises(KeyError, operator.itemgetter("print"),
|
|
gram.keywords)
|
|
finally:
|
|
gram.keywords["print"] = save
|
|
|
|
def test_fixer_loading_helpers(self):
|
|
contents = ["explicit", "first", "last", "parrot", "preorder"]
|
|
non_prefixed = refactor.get_all_fix_names("myfixes")
|
|
prefixed = refactor.get_all_fix_names("myfixes", False)
|
|
full_names = refactor.get_fixers_from_package("myfixes")
|
|
self.assertEqual(prefixed, ["fix_" + name for name in contents])
|
|
self.assertEqual(non_prefixed, contents)
|
|
self.assertEqual(full_names,
|
|
["myfixes.fix_" + name for name in contents])
|
|
|
|
def test_get_headnode_dict(self):
|
|
class NoneFix(fixer_base.BaseFix):
|
|
PATTERN = None
|
|
|
|
class FileInputFix(fixer_base.BaseFix):
|
|
PATTERN = "file_input< any * >"
|
|
|
|
no_head = NoneFix({}, [])
|
|
with_head = FileInputFix({}, [])
|
|
d = refactor.get_headnode_dict([no_head, with_head])
|
|
expected = {None: [no_head],
|
|
pygram.python_symbols.file_input : [with_head]}
|
|
self.assertEqual(d, expected)
|
|
|
|
def test_fixer_loading(self):
|
|
from myfixes.fix_first import FixFirst
|
|
from myfixes.fix_last import FixLast
|
|
from myfixes.fix_parrot import FixParrot
|
|
from myfixes.fix_preorder import FixPreorder
|
|
|
|
rt = self.rt()
|
|
pre, post = rt.get_fixers()
|
|
|
|
self.check_instances(pre, [FixPreorder])
|
|
self.check_instances(post, [FixFirst, FixParrot, FixLast])
|
|
|
|
def test_naughty_fixers(self):
|
|
self.assertRaises(ImportError, self.rt, fixers=["not_here"])
|
|
self.assertRaises(refactor.FixerError, self.rt, fixers=["no_fixer_cls"])
|
|
self.assertRaises(refactor.FixerError, self.rt, fixers=["bad_order"])
|
|
|
|
def test_refactor_string(self):
|
|
rt = self.rt()
|
|
input = "def parrot(): pass\n\n"
|
|
tree = rt.refactor_string(input, "<test>")
|
|
self.assertNotEqual(str(tree), input)
|
|
|
|
input = "def f(): pass\n\n"
|
|
tree = rt.refactor_string(input, "<test>")
|
|
self.assertEqual(str(tree), input)
|
|
|
|
def test_refactor_stdin(self):
|
|
|
|
class MyRT(refactor.RefactoringTool):
|
|
|
|
def print_output(self, lines):
|
|
diff_lines.extend(lines)
|
|
|
|
diff_lines = []
|
|
rt = MyRT(_DEFAULT_FIXERS)
|
|
save = sys.stdin
|
|
sys.stdin = StringIO.StringIO("def parrot(): pass\n\n")
|
|
try:
|
|
rt.refactor_stdin()
|
|
finally:
|
|
sys.stdin = save
|
|
expected = """--- <stdin> (original)
|
|
+++ <stdin> (refactored)
|
|
@@ -1,2 +1,2 @@
|
|
-def parrot(): pass
|
|
+def cheese(): pass""".splitlines()
|
|
self.assertEqual(diff_lines[:-1], expected)
|
|
|
|
def test_refactor_file(self):
|
|
test_file = os.path.join(FIXER_DIR, "parrot_example.py")
|
|
old_contents = open(test_file, "r").read()
|
|
rt = self.rt()
|
|
|
|
rt.refactor_file(test_file)
|
|
self.assertEqual(old_contents, open(test_file, "r").read())
|
|
|
|
rt.refactor_file(test_file, True)
|
|
try:
|
|
self.assertNotEqual(old_contents, open(test_file, "r").read())
|
|
finally:
|
|
open(test_file, "w").write(old_contents)
|
|
|
|
def test_refactor_docstring(self):
|
|
rt = self.rt()
|
|
|
|
def example():
|
|
"""
|
|
>>> example()
|
|
42
|
|
"""
|
|
out = rt.refactor_docstring(example.__doc__, "<test>")
|
|
self.assertEqual(out, example.__doc__)
|
|
|
|
def parrot():
|
|
"""
|
|
>>> def parrot():
|
|
... return 43
|
|
"""
|
|
out = rt.refactor_docstring(parrot.__doc__, "<test>")
|
|
self.assertNotEqual(out, parrot.__doc__)
|
|
|
|
def test_explicit(self):
|
|
from myfixes.fix_explicit import FixExplicit
|
|
|
|
rt = self.rt(fixers=["myfixes.fix_explicit"])
|
|
self.assertEqual(len(rt.post_order), 0)
|
|
|
|
rt = self.rt(explicit=["myfixes.fix_explicit"])
|
|
for fix in rt.post_order[None]:
|
|
if isinstance(fix, FixExplicit):
|
|
break
|
|
else:
|
|
self.fail("explicit fixer not loaded")
|