Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue 12510: Expand 2 bare excepts. Improve comments. Change deceptive name 

'name' to 'expression' as the latter is what the string actually represents.
The bug in this issue was only catching NameError and AttributeError when
evaluating an expression that was not necessarily a name.
This commit is contained in:
Terry Jan Reedy 2012-06-03 00:58:36 -04:00
parent f0775131f9
commit e93bc51b59
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Lib/idlelib/CallTips.py
View File

@ -71,16 +71,16 @@ class CallTips:
if not sur_paren: if not sur_paren:
return return
hp.set_index(sur_paren[0]) hp.set_index(sur_paren[0])
name = hp.get_expression() expression = hp.get_expression()
if not name or (not evalfuncs and name.find('(') != -1): if not expression or (not evalfuncs and expression.find('(') != -1):
return return
arg_text = self.fetch_tip(name) arg_text = self.fetch_tip(expression)
if not arg_text: if not arg_text:
return return
self.calltip = self._make_calltip_window() self.calltip = self._make_calltip_window()
self.calltip.showtip(arg_text, sur_paren[0], sur_paren[1]) self.calltip.showtip(arg_text, sur_paren[0], sur_paren[1])
def fetch_tip(self, name): def fetch_tip(self, expression):
"""Return the argument list and docstring of a function or class """Return the argument list and docstring of a function or class
If there is a Python subprocess, get the calltip there. Otherwise, If there is a Python subprocess, get the calltip there. Otherwise,
@ -96,25 +96,27 @@ class CallTips:
""" """
try: try:
rpcclt = self.editwin.flist.pyshell.interp.rpcclt rpcclt = self.editwin.flist.pyshell.interp.rpcclt
except: except AttributeError:
rpcclt = None rpcclt = None
if rpcclt: if rpcclt:
return rpcclt.remotecall("exec", "get_the_calltip", return rpcclt.remotecall("exec", "get_the_calltip",
(name,), {}) (expression,), {})
else: else:
entity = self.get_entity(name) entity = self.get_entity(expression)
return get_arg_text(entity) return get_arg_text(entity)
def get_entity(self, name): def get_entity(self, expression):
"Lookup name in a namespace spanning sys.modules and __main.dict__" """Return the object corresponding to expression evaluated
if name: in a namespace spanning sys.modules and __main.dict__.
"""
if expression:
namespace = sys.modules.copy() namespace = sys.modules.copy()
namespace.update(__main__.__dict__) namespace.update(__main__.__dict__)
try: try:
return eval(name, namespace) return eval(expression, namespace)
# any exception is possible if evalfuncs True in open_calltip except BaseException:
# at least Syntax, Name, Attribute, Index, and Key E. if not # An uncaught exception closes idle, and eval can raise any
except: # exception, especially if user classes are involved.
return None return None
def _find_constructor(class_ob): def _find_constructor(class_ob):