changeset: 91348:cc0f5d6ccb70 branch: 3.4 parent: 91346:389ef84c2823 user: Yury Selivanov date: Mon Jun 23 10:21:04 2014 -0700 files: Lib/inspect.py Lib/test/test_inspect.py Misc/NEWS description: inspect: Validate that __signature__ is None or an instance of Signature. Closes #21801. diff -r 389ef84c2823 -r cc0f5d6ccb70 Lib/inspect.py --- a/Lib/inspect.py Mon Jun 23 15:14:13 2014 +0200 +++ b/Lib/inspect.py Mon Jun 23 10:21:04 2014 -0700 @@ -1912,6 +1912,10 @@ 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 -r 389ef84c2823 -r cc0f5d6ccb70 Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py Mon Jun 23 15:14:13 2014 +0200 +++ b/Lib/test/test_inspect.py Mon Jun 23 10:21:04 2014 -0700 @@ -3048,6 +3048,13 @@ 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 -r 389ef84c2823 -r cc0f5d6ccb70 Misc/NEWS --- a/Misc/NEWS Mon Jun 23 15:14:13 2014 +0200 +++ b/Misc/NEWS Mon Jun 23 10:21:04 2014 -0700 @@ -105,6 +105,8 @@ - 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 -----