mirror of
https://github.com/python/cpython.git
synced 2025-10-31 13:41:24 +00:00
abb4274499
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76871 | benjamin.peterson | 2009-12-17 20:49:21 -0600 (Thu, 17 Dec 2009) | 1 line handle unencodable diffs gracefully #5093 ........ r76872 | benjamin.peterson | 2009-12-17 20:51:37 -0600 (Thu, 17 Dec 2009) | 1 line fix emacs header ........ r77093 | benjamin.peterson | 2009-12-28 14:43:32 -0600 (Mon, 28 Dec 2009) | 7 lines replace callable(x) with isinstance(x, collections.Callable) #7006 This is a more accurate translation than hasattr(x, '__call__') which failed in the case that somebody had put __call__ in the instance dictionary. Patch mostly by Joe Amenta. ........ r77094 | benjamin.peterson | 2009-12-28 14:45:13 -0600 (Mon, 28 Dec 2009) | 2 lines deuglify imports ........ r77095 | benjamin.peterson | 2009-12-28 14:49:23 -0600 (Mon, 28 Dec 2009) | 1 line remove unused flag ........ r77097 | benjamin.peterson | 2009-12-28 16:12:13 -0600 (Mon, 28 Dec 2009) | 2 lines clean up imports and whitespace ........ r77098 | benjamin.peterson | 2009-12-28 16:43:35 -0600 (Mon, 28 Dec 2009) | 1 line *** empty log message *** ........ r77099 | benjamin.peterson | 2009-12-28 16:45:10 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended change ........ r77100 | benjamin.peterson | 2009-12-28 16:53:21 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended changes ........ r77101 | benjamin.peterson | 2009-12-28 17:46:02 -0600 (Mon, 28 Dec 2009) | 1 line normalize whitespace ........
34 lines
1.1 KiB
Python
34 lines
1.1 KiB
Python
# Copyright 2007 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Fixer for callable().
|
|
|
|
This converts callable(obj) into isinstance(obj, collections.Callable), adding a
|
|
collections import if needed."""
|
|
|
|
# Local imports
|
|
from lib2to3 import fixer_base
|
|
from lib2to3.fixer_util import Call, Name, String, Attr, touch_import
|
|
|
|
class FixCallable(fixer_base.BaseFix):
|
|
|
|
# Ignore callable(*args) or use of keywords.
|
|
# Either could be a hint that the builtin callable() is not being used.
|
|
PATTERN = """
|
|
power< 'callable'
|
|
trailer< lpar='('
|
|
( not(arglist | argument<any '=' any>) func=any
|
|
| func=arglist<(not argument<any '=' any>) any ','> )
|
|
rpar=')' >
|
|
after=any*
|
|
>
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
func = results['func']
|
|
|
|
touch_import(None, u'collections', node=node)
|
|
|
|
args = [func.clone(), String(u', ')]
|
|
args.extend(Attr(Name(u'collections'), Name(u'Callable')))
|
|
return Call(Name(u'isinstance'), args, prefix=node.prefix)
|