(original) (raw)

changeset: 77195:4a7582866735 branch: 3.2 parent: 77189:6737c2ca98ee user: Terry Jan Reedy tjreedy@udel.edu date: Sun May 27 21:29:17 2012 -0400 files: Lib/idlelib/CallTips.py Misc/NEWS description: Issue12510: Attempting to get invalid tooltip no longer closes Idle. Original patch by Roger Serwy. diff -r 6737c2ca98ee -r 4a7582866735 Lib/idlelib/CallTips.py --- a/Lib/idlelib/CallTips.py Sun May 27 17:17:53 2012 -0400 +++ b/Lib/idlelib/CallTips.py Sun May 27 21:29:17 2012 -0400 @@ -110,7 +110,9 @@ namespace.update(__main__.__dict__) try: return eval(name, namespace) - except (NameError, AttributeError): + # any exception is possible if evalfuncs True in open_calltip + # at least Syntax, Name, Attribute, Index, and Key E. if not + except: return None def _find_constructor(class_ob): @@ -125,9 +127,10 @@ return None def get_argspec(ob): - """Get a string describing the arguments for the given object.""" + """Get a string describing the arguments for the given object, + only if it is callable.""" argspec = "" - if ob is not None: + if ob is not None and hasattr(ob, '__call__'): if isinstance(ob, type): fob = _find_constructor(ob) if fob is None: diff -r 6737c2ca98ee -r 4a7582866735 Misc/NEWS --- a/Misc/NEWS Sun May 27 17:17:53 2012 -0400 +++ b/Misc/NEWS Sun May 27 21:29:17 2012 -0400 @@ -67,6 +67,9 @@ Library ------- +- Issue12510: Attempting to get invalid tooltip no longer closes Idle. + Original patch by Roger Serwy. + - Issue #10365: File open dialog now works instead of crashing even when parent window is closed. Patch by Roger Serwy. /tjreedy@udel.edu