diff options
Diffstat (limited to 'Lib/lib2to3/fixes/fix_operator.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_operator.py | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/Lib/lib2to3/fixes/fix_operator.py b/Lib/lib2to3/fixes/fix_operator.py index d303cd2..7bf2c0d 100644 --- a/Lib/lib2to3/fixes/fix_operator.py +++ b/Lib/lib2to3/fixes/fix_operator.py @@ -1,16 +1,14 @@ """Fixer for operator functions. -operator.isCallable(obj) -> callable(obj) +operator.isCallable(obj) -> hasattr(obj, '__call__') operator.sequenceIncludes(obj) -> operator.contains(obj) -operator.isSequenceType(obj) -> isinstance(obj, collections.abc.Sequence) -operator.isMappingType(obj) -> isinstance(obj, collections.abc.Mapping) +operator.isSequenceType(obj) -> isinstance(obj, collections.Sequence) +operator.isMappingType(obj) -> isinstance(obj, collections.Mapping) operator.isNumberType(obj) -> isinstance(obj, numbers.Number) operator.repeat(obj, n) -> operator.mul(obj, n) operator.irepeat(obj, n) -> operator.imul(obj, n) """ -import collections.abc - # Local imports from lib2to3 import fixer_base from lib2to3.fixer_util import Call, Name, String, touch_import @@ -47,32 +45,33 @@ class FixOperator(fixer_base.BaseFix): @invocation("operator.contains(%s)") def _sequenceIncludes(self, node, results): - return self._handle_rename(node, results, "contains") + return self._handle_rename(node, results, u"contains") - @invocation("callable(%s)") + @invocation("hasattr(%s, '__call__')") def _isCallable(self, node, results): obj = results["obj"] - return Call(Name("callable"), [obj.clone()], prefix=node.prefix) + args = [obj.clone(), String(u", "), String(u"'__call__'")] + return Call(Name(u"hasattr"), args, prefix=node.prefix) @invocation("operator.mul(%s)") def _repeat(self, node, results): - return self._handle_rename(node, results, "mul") + return self._handle_rename(node, results, u"mul") @invocation("operator.imul(%s)") def _irepeat(self, node, results): - return self._handle_rename(node, results, "imul") + return self._handle_rename(node, results, u"imul") - @invocation("isinstance(%s, collections.abc.Sequence)") + @invocation("isinstance(%s, collections.Sequence)") def _isSequenceType(self, node, results): - return self._handle_type2abc(node, results, "collections.abc", "Sequence") + return self._handle_type2abc(node, results, u"collections", u"Sequence") - @invocation("isinstance(%s, collections.abc.Mapping)") + @invocation("isinstance(%s, collections.Mapping)") def _isMappingType(self, node, results): - return self._handle_type2abc(node, results, "collections.abc", "Mapping") + return self._handle_type2abc(node, results, u"collections", u"Mapping") @invocation("isinstance(%s, numbers.Number)") def _isNumberType(self, node, results): - return self._handle_type2abc(node, results, "numbers", "Number") + return self._handle_type2abc(node, results, u"numbers", u"Number") def _handle_rename(self, node, results, name): method = results["method"][0] @@ -82,16 +81,16 @@ class FixOperator(fixer_base.BaseFix): def _handle_type2abc(self, node, results, module, abc): touch_import(None, module, node) obj = results["obj"] - args = [obj.clone(), String(", " + ".".join([module, abc]))] - return Call(Name("isinstance"), args, prefix=node.prefix) + args = [obj.clone(), String(u", " + u".".join([module, abc]))] + return Call(Name(u"isinstance"), args, prefix=node.prefix) def _check_method(self, node, results): - method = getattr(self, "_" + results["method"][0].value) - if isinstance(method, collections.abc.Callable): + method = getattr(self, "_" + results["method"][0].value.encode("ascii")) + if callable(method): if "module" in results: return method else: - sub = (str(results["obj"]),) - invocation_str = method.invocation % sub - self.warning(node, "You should use '%s' here." % invocation_str) + sub = (unicode(results["obj"]),) + invocation_str = unicode(method.invocation) % sub + self.warning(node, u"You should use '%s' here." % invocation_str) return None |