mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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):