Commit 48fd1fee authored by Terry Jan Reedy's avatar Terry Jan Reedy

Merge 3.2 closes #12510

parents 80e0aee9 c5301ef2
...@@ -110,7 +110,9 @@ class CallTips: ...@@ -110,7 +110,9 @@ class CallTips:
namespace.update(__main__.__dict__) namespace.update(__main__.__dict__)
try: try:
return eval(name, namespace) 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 return None
def _find_constructor(class_ob): def _find_constructor(class_ob):
...@@ -125,9 +127,10 @@ def _find_constructor(class_ob): ...@@ -125,9 +127,10 @@ def _find_constructor(class_ob):
return None return None
def get_argspec(ob): 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 = "" argspec = ""
if ob is not None: if ob is not None and hasattr(ob, '__call__'):
if isinstance(ob, type): if isinstance(ob, type):
fob = _find_constructor(ob) fob = _find_constructor(ob)
if fob is None: if fob is None:
......
...@@ -49,6 +49,9 @@ Core and Builtins ...@@ -49,6 +49,9 @@ Core and Builtins
Library Library
------- -------
- Issue12510: Attempting to get invalid tooltip no longer closes Idle.
Original patch by Roger Serwy.
- Issue #14925: email now registers a defect when the parser decides that there - Issue #14925: email now registers a defect when the parser decides that there
is a missing header/body separator line. MalformedHeaderDefect, which the is a missing header/body separator line. MalformedHeaderDefect, which the
existing code would never actually generate, is deprecated. existing code would never actually generate, is deprecated.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment