mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#17296: backport fix for issue 1692335, naive exception pickling.

Browse source
This commit is contained in:
R David Murray 2013-02-27 08:57:09 -05:00
parent 5f79409889
commit 1cb0cb2fcd
3 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/test_exceptions.py
View file

@ -10,6 +10,15 @@ import errno
from test.support import (TESTFN, captured_output, check_impl_detail,
cpython_only, gc_collect, run_unittest, unlink)
class NaiveException(Exception):
def __init__(self, x):
self.x = x
class SlottedNaiveException(Exception):
__slots__ = ('x',)
def __init__(self, x):
self.x = x
# XXX This is not really enough, each *operation* should be tested!
class ExceptionTests(unittest.TestCase):
@ -272,6 +281,10 @@ class ExceptionTests(unittest.TestCase):
{'args' : ('\u3042', 0, 1, 'ouch'),
'object' : '\u3042', 'reason' : 'ouch',
'start' : 0, 'end' : 1}),
(NaiveException, ('foo',),
{'args': ('foo',), 'x': 'foo'}),
(SlottedNaiveException, ('foo',),
{'args': ('foo',), 'x': 'foo'}),
]
try:
exceptionList.append(
@ -291,7 +304,8 @@ class ExceptionTests(unittest.TestCase):
raise
else:
# Verify module name
self.assertEqual(type(e).__module__, 'builtins')
if not type(e).__name__.endswith('NaiveException'):
self.assertEqual(type(e).__module__, 'builtins')
# Verify no ref leaks in Exc_str()
s = str(e)
for checkArgName in expected: