mirror of
https://github.com/python/cpython.git
synced 2025-08-16 06:40:56 +00:00
6eccb79aa3
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r82530 | benjamin.peterson | 2010-07-04 11:11:41 -0500 (Sun, 04 Jul 2010) | 1 line simplify ignore star imports from itertools #8892 ........ r82531 | benjamin.peterson | 2010-07-04 11:13:20 -0500 (Sun, 04 Jul 2010) | 1 line wrap with parenthesis not \ ........ r82779 | benjamin.peterson | 2010-07-10 14:45:08 -0500 (Sat, 10 Jul 2010) | 1 line typo in attribute name #9217 ........ r82855 | benjamin.peterson | 2010-07-13 16:27:38 -0500 (Tue, 13 Jul 2010) | 1 line remove more extraneous commas #9245 ........ r83740 | alexandre.vassalotti | 2010-08-05 01:58:36 -0500 (Thu, 05 Aug 2010) | 4 lines Issue 5077: Update fixer for the other functions gone from the operator module. Patch by Meador Inge. ........ r83789 | benjamin.peterson | 2010-08-07 17:45:14 -0500 (Sat, 07 Aug 2010) | 1 line cleanup and use unicode consistently ........ r83790 | benjamin.peterson | 2010-08-07 17:52:06 -0500 (Sat, 07 Aug 2010) | 1 line unicode literal ........ r83791 | benjamin.peterson | 2010-08-07 17:52:55 -0500 (Sat, 07 Aug 2010) | 1 line .get() is pointless here ........ r83797 | benjamin.peterson | 2010-08-07 18:54:51 -0500 (Sat, 07 Aug 2010) | 1 line add a function to find how a node is indented ........ r83798 | benjamin.peterson | 2010-08-07 18:55:28 -0500 (Sat, 07 Aug 2010) | 1 line when splitting import statements, use correct indentation #9386 ........ r83799 | benjamin.peterson | 2010-08-07 18:57:43 -0500 (Sat, 07 Aug 2010) | 1 line double quotes ........ r83800 | benjamin.peterson | 2010-08-07 18:58:52 -0500 (Sat, 07 Aug 2010) | 1 line add another test ........ r83801 | benjamin.peterson | 2010-08-07 19:02:10 -0500 (Sat, 07 Aug 2010) | 1 line cleanup; style-nits ........ r83803 | benjamin.peterson | 2010-08-07 19:05:08 -0500 (Sat, 07 Aug 2010) | 1 line slightly more explicit ........ r83811 | benjamin.peterson | 2010-08-07 22:56:44 -0500 (Sat, 07 Aug 2010) | 4 lines Fix node.pre_order() to call the right method on its children. This was a rather tragic copy-paste error. ........ r83827 | benjamin.peterson | 2010-08-08 08:12:48 -0500 (Sun, 08 Aug 2010) | 1 line cause test to actually run and fix it ........ r83844 | benjamin.peterson | 2010-08-08 13:46:37 -0500 (Sun, 08 Aug 2010) | 1 line fix whitespace ........
87 lines
3.2 KiB
Python
87 lines
3.2 KiB
Python
"""Fixer for operator functions.
|
|
|
|
operator.isCallable(obj) -> hasattr(obj, '__call__')
|
|
operator.sequenceIncludes(obj) -> operator.contains(obj)
|
|
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)
|
|
"""
|
|
|
|
# Local imports
|
|
from lib2to3 import fixer_base
|
|
from lib2to3.fixer_util import Call, Name, String, touch_import
|
|
|
|
|
|
class FixOperator(fixer_base.BaseFix):
|
|
|
|
methods = """
|
|
method=('isCallable'|'sequenceIncludes'
|
|
|'isSequenceType'|'isMappingType'|'isNumberType'
|
|
|'repeat'|'irepeat')
|
|
"""
|
|
obj = "'(' obj=any ')'"
|
|
PATTERN = """
|
|
power< module='operator'
|
|
trailer< '.' %(methods)s > trailer< %(obj)s > >
|
|
|
|
|
power< %(methods)s trailer< %(obj)s > >
|
|
""" % dict(methods=methods, obj=obj)
|
|
|
|
def transform(self, node, results):
|
|
method = self._check_method(node, results)
|
|
if method is not None:
|
|
return method(node, results)
|
|
|
|
def _sequenceIncludes(self, node, results):
|
|
"""operator.contains(%s)"""
|
|
return self._handle_rename(node, results, u"contains")
|
|
|
|
def _isCallable(self, node, results):
|
|
"""hasattr(%s, '__call__')"""
|
|
obj = results["obj"]
|
|
args = [obj.clone(), String(u", "), String(u"'__call__'")]
|
|
return Call(Name(u"hasattr"), args, prefix=node.prefix)
|
|
|
|
def _repeat(self, node, results):
|
|
"""operator.mul(%s)"""
|
|
return self._handle_rename(node, results, u"mul")
|
|
|
|
def _irepeat(self, node, results):
|
|
"""operator.imul(%s)"""
|
|
return self._handle_rename(node, results, u"imul")
|
|
|
|
def _isSequenceType(self, node, results):
|
|
"""isinstance(%s, collections.Sequence)"""
|
|
return self._handle_type2abc(node, results, u"collections", u"Sequence")
|
|
|
|
def _isMappingType(self, node, results):
|
|
"""isinstance(%s, collections.Mapping)"""
|
|
return self._handle_type2abc(node, results, u"collections", u"Mapping")
|
|
|
|
def _isNumberType(self, node, results):
|
|
"""isinstance(%s, numbers.Number)"""
|
|
return self._handle_type2abc(node, results, u"numbers", u"Number")
|
|
|
|
def _handle_rename(self, node, results, name):
|
|
method = results["method"][0]
|
|
method.value = name
|
|
method.changed()
|
|
|
|
def _handle_type2abc(self, node, results, module, abc):
|
|
touch_import(None, module, node)
|
|
obj = results["obj"]
|
|
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.encode("ascii"))
|
|
if callable(method):
|
|
if "module" in results:
|
|
return method
|
|
else:
|
|
sub = (unicode(results["obj"]),)
|
|
invocation_str = unicode(method.__doc__) % sub
|
|
self.warning(node, u"You should use '%s' here." % invocation_str)
|
|
return None
|