mirror of
https://github.com/python/cpython
synced 2026-09-29 09:25:29 +03:00
Merge 3.2 closes #12510
This commit is contained in:
commit
48fd1fee38
2 changed files with 9 additions and 3 deletions
|
|
@ -110,7 +110,9 @@ class CallTips:
|
|||
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 @@ def _find_constructor(class_ob):
|
|||
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:
|
||||
|
|
|
|||
|
|
@ -49,6 +49,9 @@ Core and Builtins
|
|||
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
|
||||
is a missing header/body separator line. MalformedHeaderDefect, which the
|
||||
existing code would never actually generate, is deprecated.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue