mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-16 14:50:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 76871-76872,77093-77095,77097-77101 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2009-12-28 23:50:41 +00:00
parent 0d19eaf1eb
commit abb4274499
6 changed files with 123 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/lib2to3/fixes/fix_callable.py
View file

@ -3,12 +3,12 @@
"""Fixer for callable().
This converts callable(obj) into hasattr(obj, '__call__')."""
This converts callable(obj) into isinstance(obj, collections.Callable), adding a
collections import if needed."""
# Local imports
from .. import pytree
from .. import fixer_base
from ..fixer_util import Call, Name, String
from lib2to3 import fixer_base
from lib2to3.fixer_util import Call, Name, String, Attr, touch_import
class FixCallable(fixer_base.BaseFix):
@ -25,7 +25,10 @@ class FixCallable(fixer_base.BaseFix):
"""
def transform(self, node, results):
func = results["func"]
func = results['func']
args = [func.clone(), String(u', '), String(u"'__call__'")]
return Call(Name(u"hasattr"), args, prefix=node.prefix)
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)