diff -r ab6209ce77b6 Lib/inspect.py --- a/Lib/inspect.py Fri Jun 20 17:34:44 2014 +0200 +++ b/Lib/inspect.py Fri Jun 20 11:09:25 2014 -0700 @@ -1939,6 +1939,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 ab6209ce77b6 Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py Fri Jun 20 17:34:44 2014 +0200 +++ b/Lib/test/test_inspect.py Fri Jun 20 11:09:25 2014 -0700 @@ -3136,6 +3136,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):