diff options
| author | Brett Cannon <bcannon@gmail.com> | 2006-03-01 04:25:17 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2006-03-01 04:25:17 (GMT) |
| commit | bf36409e2a8171b441d5e0a2f1c9e02d31a35ae8 (patch) | |
| tree | 7456cf3d197d6f0dc017b0f851878bcaf6024f6c /Python/codecs.c | |
| parent | 762467475d944f67ac20bf23c6c5144a6e39feae (diff) | |
| download | cpython-bf36409e2a8171b441d5e0a2f1c9e02d31a35ae8.zip cpython-bf36409e2a8171b441d5e0a2f1c9e02d31a35ae8.tar.gz cpython-bf36409e2a8171b441d5e0a2f1c9e02d31a35ae8.tar.bz2 | |
PEP 352 implementation. Creates a new base class, BaseException, which has an
added message attribute compared to the previous version of Exception. It is
also a new-style class, making all exceptions now new-style. KeyboardInterrupt
and SystemExit inherit from BaseException directly. String exceptions now
raise DeprecationWarning.
Applies patch 1104669, and closes bugs 1012952 and 518846.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index cd31e1c..253bc39 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -448,9 +448,8 @@ static void wrong_exception_type(PyObject *exc) PyObject *PyCodec_StrictErrors(PyObject *exc) { - if (PyInstance_Check(exc)) - PyErr_SetObject((PyObject*)((PyInstanceObject*)exc)->in_class, - exc); + if (PyExceptionInstance_Check(exc)) + PyErr_SetObject(PyExceptionInstance_Class(exc), exc); else PyErr_SetString(PyExc_TypeError, "codec must pass exception instance"); return NULL; |