mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Remove 2to3's fix_callable... We reintroduced the callable built-in
pretty early on in the 3.x series (3.1 or 3.2?).
This commit is contained in:
parent
935043d1ac
commit
223f12c9eb
2 changed files with 0 additions and 129 deletions
|
@ -2919,98 +2919,6 @@ class Test_unicode(FixerTestCase):
|
|||
a = f + r"""r'\\\u20ac\U0001d121\\u20ac'"""
|
||||
self.check(b, a)
|
||||
|
||||
class Test_callable(FixerTestCase):
|
||||
fixer = "callable"
|
||||
|
||||
def test_prefix_preservation(self):
|
||||
b = """callable( x)"""
|
||||
a = """import collections\nisinstance( x, collections.Callable)"""
|
||||
self.check(b, a)
|
||||
|
||||
b = """if callable(x): pass"""
|
||||
a = """import collections
|
||||
if isinstance(x, collections.Callable): pass"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_callable_call(self):
|
||||
b = """callable(x)"""
|
||||
a = """import collections\nisinstance(x, collections.Callable)"""
|
||||
self.check(b, a)
|
||||
|
||||
def test_global_import(self):
|
||||
b = """
|
||||
def spam(foo):
|
||||
callable(foo)"""[1:]
|
||||
a = """
|
||||
import collections
|
||||
def spam(foo):
|
||||
isinstance(foo, collections.Callable)"""[1:]
|
||||
self.check(b, a)
|
||||
|
||||
b = """
|
||||
import collections
|
||||
def spam(foo):
|
||||
callable(foo)"""[1:]
|
||||
# same output if it was already imported
|
||||
self.check(b, a)
|
||||
|
||||
b = """
|
||||
from collections import *
|
||||
def spam(foo):
|
||||
callable(foo)"""[1:]
|
||||
a = """
|
||||
from collections import *
|
||||
import collections
|
||||
def spam(foo):
|
||||
isinstance(foo, collections.Callable)"""[1:]
|
||||
self.check(b, a)
|
||||
|
||||
b = """
|
||||
do_stuff()
|
||||
do_some_other_stuff()
|
||||
assert callable(do_stuff)"""[1:]
|
||||
a = """
|
||||
import collections
|
||||
do_stuff()
|
||||
do_some_other_stuff()
|
||||
assert isinstance(do_stuff, collections.Callable)"""[1:]
|
||||
self.check(b, a)
|
||||
|
||||
b = """
|
||||
if isinstance(do_stuff, Callable):
|
||||
assert callable(do_stuff)
|
||||
do_stuff(do_stuff)
|
||||
if not callable(do_stuff):
|
||||
exit(1)
|
||||
else:
|
||||
assert callable(do_stuff)
|
||||
else:
|
||||
assert not callable(do_stuff)"""[1:]
|
||||
a = """
|
||||
import collections
|
||||
if isinstance(do_stuff, Callable):
|
||||
assert isinstance(do_stuff, collections.Callable)
|
||||
do_stuff(do_stuff)
|
||||
if not isinstance(do_stuff, collections.Callable):
|
||||
exit(1)
|
||||
else:
|
||||
assert isinstance(do_stuff, collections.Callable)
|
||||
else:
|
||||
assert not isinstance(do_stuff, collections.Callable)"""[1:]
|
||||
self.check(b, a)
|
||||
|
||||
def test_callable_should_not_change(self):
|
||||
a = """callable(*x)"""
|
||||
self.unchanged(a)
|
||||
|
||||
a = """callable(x, y)"""
|
||||
self.unchanged(a)
|
||||
|
||||
a = """callable(x, kw=y)"""
|
||||
self.unchanged(a)
|
||||
|
||||
a = """callable()"""
|
||||
self.unchanged(a)
|
||||
|
||||
class Test_filter(FixerTestCase):
|
||||
fixer = "filter"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue