summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-27 13:57:09 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-27 13:57:09 (GMT)
commit1cb0cb2fcdc83a6caa871104a622d1217ca034a3 (patch)
tree30adf3f3b7af0f167b4fa7d618b0fcdddf6e605b
parent5f794098898b49650b2ef6a0c4f48aa0d03b0298 (diff)
downloadcpython-1cb0cb2fcdc83a6caa871104a622d1217ca034a3.zip
cpython-1cb0cb2fcdc83a6caa871104a622d1217ca034a3.tar.gz
cpython-1cb0cb2fcdc83a6caa871104a622d1217ca034a3.tar.bz2
#17296: backport fix for issue 1692335, naive exception pickling.
-rw-r--r--Lib/test/test_exceptions.py16
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/exceptions.c11
3 files changed, 28 insertions, 2 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 79bd7ff..28dcb24 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 3cd2a81..3313588 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins
-----------------
+- Issue #1692335: Move initial args assignment to
+ BaseException.__new__ to help pickling of naive subclasses.
+
- Issue #17275: Corrected class name in init error messages of the C version of
BufferedWriter and BufferedRandom.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 9daa12a..a4e90fc 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -29,6 +29,12 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->dict = NULL;
self->traceback = self->cause = self->context = NULL;
+ if (args) {
+ self->args = args;
+ Py_INCREF(args);
+ return (PyObject *)self;
+ }
+
self->args = PyTuple_New(0);
if (!self->args) {
Py_DECREF(self);
@@ -41,12 +47,15 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static int
BaseException_init(PyBaseExceptionObject *self, PyObject *args, PyObject *kwds)
{
+ PyObject *tmp;
+
if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds))
return -1;
- Py_DECREF(self->args);
+ tmp = self->args;
self->args = args;
Py_INCREF(self->args);
+ Py_XDECREF(tmp);
return 0;
}