mirror of
https://github.com/python/cpython.git
synced 2025-07-24 19:54:21 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line force the imports fixer to be run after the import one #6400 ........ r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line check for sep, not pathsep when looking for a subpackage #6408 ........ r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line don't print diffs by default; it's annoying ........ r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line complain when not showing diffs or writing ........ r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines Fix test_refactor_stdin to handle print_output() method with 4 arguments. ........ r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines Issue 2370: Add fixer for the removal of operator.isCallable() and operator.sequenceIncludes(). Patch contributed by Jeff Balogh (and updated by me). ........ r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line cleanup and use unicode where appropiate ........ r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line fix calls to str() with unicode() ........ r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line more str() -> unicode() ........ r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line add tests for refactor_dir() ........ r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line don't parse files just because they end with 'py' (no dot) ........ r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line simplify ........ r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line remove usage of get_prefix() ........ r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line revert unintended change in 73965 ........ r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line avoid expensive checks and assume the node did change ........ r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line use a regular dict for the heads to avoid adding lists in the loop ........ r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line prefix headnode functions with '_' ........ r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line try to make the head node dict as sparse as possible ........ r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line a better idea; add an option to *not* print diffs ........ r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line add space ........ r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line update get_headnode_dict tests for recent changes ........ r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines detect when "from __future__ import print_function" is given Deprecate the 'print_function' option and the -p flag ........ r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line add tests for Call; thanks Joe Amenta ........ r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line pathname2url and url2pathname are in urllib.request not urllib.parse #6496 ........ r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line fix deprecation warnings in tests ........ ................
265 lines
9.1 KiB
Python
265 lines
9.1 KiB
Python
"""
|
|
Unit tests for refactor.py.
|
|
"""
|
|
|
|
import sys
|
|
import os
|
|
import operator
|
|
import io
|
|
import tempfile
|
|
import shutil
|
|
import unittest
|
|
import warnings
|
|
|
|
from lib2to3 import refactor, pygram, fixer_base
|
|
from lib2to3.pgen2 import token
|
|
|
|
from . import support
|
|
|
|
|
|
TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data")
|
|
FIXER_DIR = os.path.join(TEST_DATA_DIR, "fixers")
|
|
|
|
sys.path.append(FIXER_DIR)
|
|
try:
|
|
_DEFAULT_FIXERS = refactor.get_fixers_from_package("myfixes")
|
|
finally:
|
|
sys.path.pop()
|
|
|
|
_2TO3_FIXERS = refactor.get_fixers_from_package("lib2to3.fixes")
|
|
|
|
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):
|
|
with warnings.catch_warnings(record=True) as w:
|
|
refactor.RefactoringTool(_DEFAULT_FIXERS, {"print_function" : True})
|
|
self.assertEqual(len(w), 1)
|
|
msg, = w
|
|
self.assertTrue(msg.category is DeprecationWarning)
|
|
|
|
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_detect_future_print(self):
|
|
run = refactor._detect_future_print
|
|
self.assertFalse(run(""))
|
|
self.assertTrue(run("from __future__ import print_function"))
|
|
self.assertFalse(run("from __future__ import generators"))
|
|
self.assertFalse(run("from __future__ import generators, feature"))
|
|
input = "from __future__ import generators, print_function"
|
|
self.assertTrue(run(input))
|
|
input ="from __future__ import print_function, generators"
|
|
self.assertTrue(run(input))
|
|
input = "from __future__ import (print_function,)"
|
|
self.assertTrue(run(input))
|
|
input = "from __future__ import (generators, print_function)"
|
|
self.assertTrue(run(input))
|
|
input = "from __future__ import (generators, nested_scopes)"
|
|
self.assertFalse(run(input))
|
|
input = """from __future__ import generators
|
|
from __future__ import print_function"""
|
|
self.assertTrue(run(input))
|
|
self.assertFalse(run("from"))
|
|
self.assertFalse(run("from 4"))
|
|
self.assertFalse(run("from x"))
|
|
self.assertFalse(run("from x 5"))
|
|
self.assertFalse(run("from x im"))
|
|
self.assertFalse(run("from x import"))
|
|
self.assertFalse(run("from x import 4"))
|
|
input = "'docstring'\nfrom __future__ import print_function"
|
|
self.assertTrue(run(input))
|
|
input = "'docstring'\n'somng'\nfrom __future__ import print_function"
|
|
self.assertFalse(run(input))
|
|
input = "# comment\nfrom __future__ import print_function"
|
|
self.assertTrue(run(input))
|
|
input = "# comment\n'doc'\nfrom __future__ import print_function"
|
|
self.assertTrue(run(input))
|
|
input = "class x: pass\nfrom __future__ import print_function"
|
|
self.assertFalse(run(input))
|
|
|
|
def test_get_headnode_dict(self):
|
|
class NoneFix(fixer_base.BaseFix):
|
|
pass
|
|
|
|
class FileInputFix(fixer_base.BaseFix):
|
|
PATTERN = "file_input< any * >"
|
|
|
|
class SimpleFix(fixer_base.BaseFix):
|
|
PATTERN = "'name'"
|
|
|
|
no_head = NoneFix({}, [])
|
|
with_head = FileInputFix({}, [])
|
|
simple = SimpleFix({}, [])
|
|
d = refactor._get_headnode_dict([no_head, with_head, simple])
|
|
top_fixes = d.pop(pygram.python_symbols.file_input)
|
|
self.assertEqual(top_fixes, [with_head, no_head])
|
|
name_fixes = d.pop(token.NAME)
|
|
self.assertEqual(name_fixes, [simple, no_head])
|
|
for fixes in d.values():
|
|
self.assertEqual(fixes, [no_head])
|
|
|
|
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, old_text, new_text, filename, equal):
|
|
results.extend([old_text, new_text, filename, equal])
|
|
|
|
results = []
|
|
rt = MyRT(_DEFAULT_FIXERS)
|
|
save = sys.stdin
|
|
sys.stdin = io.StringIO("def parrot(): pass\n\n")
|
|
try:
|
|
rt.refactor_stdin()
|
|
finally:
|
|
sys.stdin = save
|
|
expected = ["def parrot(): pass\n\n",
|
|
"def cheese(): pass\n\n",
|
|
"<stdin>", False]
|
|
self.assertEqual(results, expected)
|
|
|
|
def check_file_refactoring(self, test_file, fixers=_2TO3_FIXERS):
|
|
def read_file():
|
|
with open(test_file, "rb") as fp:
|
|
return fp.read()
|
|
old_contents = read_file()
|
|
rt = self.rt(fixers=fixers)
|
|
|
|
rt.refactor_file(test_file)
|
|
self.assertEqual(old_contents, read_file())
|
|
|
|
try:
|
|
rt.refactor_file(test_file, True)
|
|
self.assertNotEqual(old_contents, read_file())
|
|
finally:
|
|
with open(test_file, "wb") as fp:
|
|
fp.write(old_contents)
|
|
|
|
def test_refactor_file(self):
|
|
test_file = os.path.join(FIXER_DIR, "parrot_example.py")
|
|
self.check_file_refactoring(test_file, _DEFAULT_FIXERS)
|
|
|
|
def test_refactor_dir(self):
|
|
def check(structure, expected):
|
|
def mock_refactor_file(self, f, *args):
|
|
got.append(f)
|
|
save_func = refactor.RefactoringTool.refactor_file
|
|
refactor.RefactoringTool.refactor_file = mock_refactor_file
|
|
rt = self.rt()
|
|
got = []
|
|
dir = tempfile.mkdtemp(prefix="2to3-test_refactor")
|
|
try:
|
|
os.mkdir(os.path.join(dir, "a_dir"))
|
|
for fn in structure:
|
|
open(os.path.join(dir, fn), "wb").close()
|
|
rt.refactor_dir(dir)
|
|
finally:
|
|
refactor.RefactoringTool.refactor_file = save_func
|
|
shutil.rmtree(dir)
|
|
self.assertEqual(got,
|
|
[os.path.join(dir, path) for path in expected])
|
|
check([], [])
|
|
tree = ["nothing",
|
|
"hi.py",
|
|
".dumb",
|
|
".after.py",
|
|
"sappy"]
|
|
expected = ["hi.py"]
|
|
check(tree, expected)
|
|
tree = ["hi.py",
|
|
"a_dir/stuff.py"]
|
|
check(tree, tree)
|
|
|
|
def test_file_encoding(self):
|
|
fn = os.path.join(TEST_DATA_DIR, "different_encoding.py")
|
|
self.check_file_refactoring(fn)
|
|
|
|
def test_crlf_newlines(self):
|
|
old_sep = os.linesep
|
|
os.linesep = "\r\n"
|
|
try:
|
|
fn = os.path.join(TEST_DATA_DIR, "crlf.py")
|
|
fixes = refactor.get_fixers_from_package("lib2to3.fixes")
|
|
self.check_file_refactoring(fn, fixes)
|
|
finally:
|
|
os.linesep = old_sep
|
|
|
|
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:
|
|
if isinstance(fix, FixExplicit):
|
|
break
|
|
else:
|
|
self.fail("explicit fixer not loaded")
|