mirror of
https://github.com/python/cpython.git
synced 2025-10-31 05:31:20 +00:00
Merged revisions 80936 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80936 | benjamin.peterson | 2010-05-07 14:10:11 -0500 (Fri, 07 May 2010) | 76 lines
Merged revisions 80934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r80934 | benjamin.peterson | 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) | 69 lines
Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line
use absolute import
........
r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line
generalize detection of __future__ imports and attach them to the tree
........
r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line
don't try to 'fix' relative imports when absolute_import is enabled #8858
........
r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines
prevent diffs from being mangled is multiprocess mode #6409
Patch by George Boutsioukis.
........
r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line
remove unhelpful description
........
r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line
use unicode literals
........
r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines
Don't transform imports that are already relative. 2to3 turned
from . import refactor
into
from .. import refactor
which broke the transformation of 2to3 itself.
........
r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line
remove imports
........
r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literal
........
r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line
must pass a string to Number
........
r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line
unicode literals
........
r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line
pass string to Number
........
r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines
Make 2to3 run under Python 2.5 so that the benchmark suite at
http://hg.python.org/benchmarks/ can use it and still run on implementations
that haven't gotten to 2.6 yet. Fixes issue 8566.
........
r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line
prevent xrange transformation from wrapping range calls it produces in list
........
................
................
This commit is contained in:
Benjamin Peterson
parent
3a3bba34e2
commit
c9e833faa0
13 changed files with 165 additions and 88 deletions
|
|
@ -2,6 +2,8 @@
|
|||
Unit tests for refactor.py.
|
||||
"""
|
||||
|
||||
from __future__ import with_statement
|
||||
|
||||
import sys
|
||||
import os
|
||||
import codecs
|
||||
|
|
@ -61,42 +63,50 @@ def test_fixer_loading_helpers(self):
|
|||
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
|
||||
def test_detect_future_features(self):
|
||||
run = refactor._detect_future_features
|
||||
fs = frozenset
|
||||
empty = fs()
|
||||
self.assertEqual(run(""), empty)
|
||||
self.assertEqual(run("from __future__ import print_function"),
|
||||
fs(("print_function",)))
|
||||
self.assertEqual(run("from __future__ import generators"),
|
||||
fs(("generators",)))
|
||||
self.assertEqual(run("from __future__ import generators, feature"),
|
||||
fs(("generators", "feature")))
|
||||
inp = "from __future__ import generators, print_function"
|
||||
self.assertEqual(run(inp), fs(("generators", "print_function")))
|
||||
inp ="from __future__ import print_function, generators"
|
||||
self.assertEqual(run(inp), fs(("print_function", "generators")))
|
||||
inp = "from __future__ import (print_function,)"
|
||||
self.assertEqual(run(inp), fs(("print_function",)))
|
||||
inp = "from __future__ import (generators, print_function)"
|
||||
self.assertEqual(run(inp), fs(("generators", "print_function")))
|
||||
inp = "from __future__ import (generators, nested_scopes)"
|
||||
self.assertEqual(run(inp), fs(("generators", "nested_scopes")))
|
||||
inp = """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))
|
||||
self.assertEqual(run(inp), fs(("generators", "print_function")))
|
||||
invalid = ("from",
|
||||
"from 4",
|
||||
"from x",
|
||||
"from x 5",
|
||||
"from x im",
|
||||
"from x import",
|
||||
"from x import 4",
|
||||
)
|
||||
for inp in invalid:
|
||||
self.assertEqual(run(inp), empty)
|
||||
inp = "'docstring'\nfrom __future__ import print_function"
|
||||
self.assertEqual(run(inp), fs(("print_function",)))
|
||||
inp = "'docstring'\n'somng'\nfrom __future__ import print_function"
|
||||
self.assertEqual(run(inp), empty)
|
||||
inp = "# comment\nfrom __future__ import print_function"
|
||||
self.assertEqual(run(inp), fs(("print_function",)))
|
||||
inp = "# comment\n'doc'\nfrom __future__ import print_function"
|
||||
self.assertEqual(run(inp), fs(("print_function",)))
|
||||
inp = "class x: pass\nfrom __future__ import print_function"
|
||||
self.assertEqual(run(inp), empty)
|
||||
|
||||
def test_get_headnode_dict(self):
|
||||
class NoneFix(fixer_base.BaseFix):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue