traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-32046: Update 2to3 when converts operator.isCallable(obj). (#4417)

This commit is contained in:
Dong-hee Na 2017-11-29 01:26:56 +09:00 committed by Éric Araujo
parent 598ceae876
commit a489599793
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/2to3.rst
View File

@ -351,7 +351,7 @@ and off individually. They are described here in more detail.
================================== =============================================
From To
================================== =============================================
``operator.isCallable(obj)`` ``hasattr(obj, '__call__')``
``operator.isCallable(obj)`` ``callable(obj)``
``operator.sequenceIncludes(obj)`` ``operator.contains(obj)``
``operator.isSequenceType(obj)`` ``isinstance(obj, collections.abc.Sequence)``
``operator.isMappingType(obj)`` ``isinstance(obj, collections.abc.Mapping)``

7
Lib/lib2to3/fixes/fix_operator.py
View File

@ -1,6 +1,6 @@
"""Fixer for operator functions.
operator.isCallable(obj) -> hasattr(obj, '__call__')
operator.isCallable(obj) -> callable(obj)
operator.sequenceIncludes(obj) -> operator.contains(obj)
operator.isSequenceType(obj) -> isinstance(obj, collections.abc.Sequence)
operator.isMappingType(obj) -> isinstance(obj, collections.abc.Mapping)
@ -49,11 +49,10 @@ class FixOperator(fixer_base.BaseFix):
def _sequenceIncludes(self, node, results):
return self._handle_rename(node, results, "contains")
@invocation("hasattr(%s, '__call__')")
@invocation("callable(%s)")
def _isCallable(self, node, results):
obj = results["obj"]
args = [obj.clone(), String(", "), String("'__call__'")]
return Call(Name("hasattr"), args, prefix=node.prefix)
return Call(Name("callable"), [obj.clone()], prefix=node.prefix)
@invocation("operator.mul(%s)")
def _repeat(self, node, results):

4
Lib/lib2to3/tests/test_fixers.py
View File

@ -4409,7 +4409,7 @@ class Test_operator(FixerTestCase):
def test_operator_isCallable(self):
b = "operator.isCallable(x)"
a = "hasattr(x, '__call__')"
a = "callable(x)"
self.check(b, a)
def test_operator_sequenceIncludes(self):
@ -4468,7 +4468,7 @@ class Test_operator(FixerTestCase):
def test_bare_isCallable(self):
s = "isCallable(x)"
t = "You should use 'hasattr(x, '__call__')' here."
t = "You should use 'callable(x)' here."
self.warns_unchanged(s, t)
def test_bare_sequenceIncludes(self):

2
Misc/NEWS.d/next/Library/2017-11-16-20-09-45.bpo-32046.9sGDtw.rst Normal file
View File

@ -0,0 +1,2 @@
Updates 2to3 to convert from operator.isCallable(obj) to callable(obj).
Patch by Dong-hee Na.