aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2014-06-23 10:21:04 -0700
committerYury Selivanov <yselivanov@sprymix.com>2014-06-23 10:21:04 -0700
commitc0f964fd55b0c5dbc8af895394258784735f1189 (patch)
treed936e99ea3bae8c2b207c024b6dc13b649d84e47
parent751c7c0f2db30a8a29383ec105d200991c209fe8 (diff)
downloadcpython-c0f964fd55b0c5dbc8af895394258784735f1189.tar.gz
cpython-c0f964fd55b0c5dbc8af895394258784735f1189.zip
inspect: Validate that __signature__ is None or an instance of Signature.
Closes #21801.
-rw-r--r--Lib/inspect.py4
-rw-r--r--Lib/test/test_inspect.py7
-rw-r--r--Misc/NEWS2
3 files changed, 13 insertions, 0 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 4c3e33df7a0..f6e1b4789f1 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1912,6 +1912,10 @@ def _signature_internal(obj, follow_wrapper_chains=True, skip_bound_arg=True):
pass
else:
if sig is not None:
+ if not isinstance(sig, Signature):
+ raise TypeError(
+ 'unexpected object {!r} in __signature__ '
+ 'attribute'.format(sig))
return sig
try:
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 1ede3b5097a..da0572d17a0 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -3048,6 +3048,13 @@ class TestMain(unittest.TestCase):
self.assertEqual(lines[:-1], inspect.getsource(module).splitlines())
self.assertEqual(err, b'')
+ def test_custom_getattr(self):
+ def foo():
+ pass
+ foo.__signature__ = 42
+ with self.assertRaises(TypeError):
+ inspect.signature(foo)
+
@unittest.skipIf(ThreadPoolExecutor is None,
'threads required to test __qualname__ for source files')
def test_qualname_source(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 128937ef874..52c1e0e0aee 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -105,6 +105,8 @@ Library
- Issue #21538: The plistlib module now supports loading of binary plist files
when reference or offset size is not a power of two.
+- Issue #21801: Validate that __signature__ is None or an instance of Signature.
+
Build
-----