From 1325790b932c4bab4f8f94f5a36c09f4036ed9f8 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 7 Jun 2007 23:15:56 +0000 Subject: Merged revisions 55795-55816 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines Get rid of some remnants of classic classes. types.ClassType == type. Also get rid of almost all uses of the types module and use the builtin name. ........ r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line Remove a use of types, verify commit hook works ........ r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines Fix syntax error introduced by Neal in last checkin. ........ --- Lib/idlelib/CallTips.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/idlelib/CallTips.py') diff --git a/Lib/idlelib/CallTips.py b/Lib/idlelib/CallTips.py index 6f362f9f70..6f81af4891 100644 --- a/Lib/idlelib/CallTips.py +++ b/Lib/idlelib/CallTips.py @@ -131,14 +131,14 @@ def get_arg_text(ob): arg_text = "" if ob is not None: arg_offset = 0 - if type(ob) in (types.ClassType, types.TypeType): + if isinstance(ob, type): # Look for the highest __init__ in the class chain. fob = _find_constructor(ob) if fob is None: fob = lambda: None else: arg_offset = 1 - elif type(ob)==types.MethodType: + elif isinstace(ob, types.MethodType): # bit of a hack for methods - turn it into a function # but we drop the "self" param. fob = ob.im_func @@ -146,7 +146,7 @@ def get_arg_text(ob): else: fob = ob # Try to build one for Python defined functions - if type(fob) in [types.FunctionType, types.LambdaType]: + if isinstance(fob, (types.FunctionType, types.LambdaType)): argcount = fob.__code__.co_argcount real_args = fob.__code__.co_varnames[arg_offset:argcount] defaults = fob.__defaults__ or [] -- cgit v1.2.1