Issue #1692335: Move initial args assignment to BaseException.__new__
to help pickling of naive subclasses.
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 97762f9..0b1fd1b 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -10,6 +10,15 @@
from test.support import (TESTFN, unlink, run_unittest, captured_output,
gc_collect, cpython_only, no_tracing)
+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):
@@ -296,6 +305,10 @@
{'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:
# More tests are in test_WindowsError
@@ -316,7 +329,8 @@
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 cabea97..5201d49 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #1692335: Move initial args assignment to
+ BaseException.__new__ to help pickling of naive subclasses.
+
- Issue #12834: Fix PyBuffer_ToContiguous() for non-contiguous arrays.
- Issue #15456: Fix code __sizeof__ after #12399 change.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 5c85f10..b7e11f8 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -44,6 +44,12 @@
self->traceback = self->cause = self->context = NULL;
self->suppress_context = 0;
+ if (args) {
+ self->args = args;
+ Py_INCREF(args);
+ return (PyObject *)self;
+ }
+
self->args = PyTuple_New(0);
if (!self->args) {
Py_DECREF(self);
@@ -56,12 +62,15 @@
static int
BaseException_init(PyBaseExceptionObject *self, PyObject *args, PyObject *kwds)
{
+ PyObject *tmp;
+
if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds))
return -1;
- Py_XDECREF(self->args);
+ tmp = self->args;
self->args = args;
Py_INCREF(self->args);
+ Py_XDECREF(tmp);
return 0;
}