From 50fd60b2bb174b8c4851db4d16c0ead629b21b4d Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Sat, 30 Jul 2016 14:14:12 +0300 Subject: Issue #27652: Expose ESHUTDOWN conditionally ESHUTDOWN is also exposed conditionally in Modules/errnomodule.c. Patch by Ed Schouten. --- Objects/exceptions.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Objects/exceptions.c') diff --git a/Objects/exceptions.c b/Objects/exceptions.c index d97d569edb..f829d32c99 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2604,7 +2604,9 @@ _PyExc_Init(PyObject *bltinmod) ADD_ERRNO(BlockingIOError, EWOULDBLOCK); POST_INIT(BrokenPipeError); ADD_ERRNO(BrokenPipeError, EPIPE); +#ifdef ESHUTDOWN ADD_ERRNO(BrokenPipeError, ESHUTDOWN); +#endif POST_INIT(ChildProcessError); ADD_ERRNO(ChildProcessError, ECHILD); POST_INIT(ConnectionAbortedError); -- cgit v1.2.1 From cf972926a4edb604ffa272c51493ad69068493dc Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 20 Aug 2016 21:22:03 +0300 Subject: Issue #27692: Removed unnecessary NULL checks in exceptions.c. Patch by Xiang Zhang. --- Objects/exceptions.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Objects/exceptions.c') diff --git a/Objects/exceptions.c b/Objects/exceptions.c index f829d32c99..e85d743dab 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -230,7 +230,7 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb) return -1; } - Py_XINCREF(tb); + Py_INCREF(tb); Py_XSETREF(self->traceback, tb); return 0; } @@ -985,7 +985,7 @@ OSError_init(PyOSErrorObject *self, PyObject *args, PyObject *kwds) return 0; error: - Py_XDECREF(args); + Py_DECREF(args); return -1; } @@ -1065,8 +1065,7 @@ OSError_str(PyOSErrorObject *self) } if (self->myerrno && self->strerror) return PyUnicode_FromFormat("[Errno %S] %S", - self->myerrno ? self->myerrno: Py_None, - self->strerror ? self->strerror: Py_None); + self->myerrno, self->strerror); return BaseException_str((PyBaseExceptionObject *)self); } -- cgit v1.2.1 From ee1f94f1161d806ce7158ad039522798ff4f35ac Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Wed, 7 Sep 2016 15:42:32 -0700 Subject: Issue #15767: Add ModuleNotFoundError. --- Objects/exceptions.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Objects/exceptions.c') diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 336c32c8a4..6fb5eb7214 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -705,6 +705,13 @@ ComplexExtendsException(PyExc_Exception, ImportError, "Import can't find module, or can't find name in " "module."); +/* + * ModuleNotFoundError extends ImportError + */ + +MiddlingExtendsException(PyExc_ImportError, ModuleNotFoundError, ImportError, + "Module not found."); + /* * OSError extends Exception */ @@ -2469,6 +2476,7 @@ _PyExc_Init(PyObject *bltinmod) PRE_INIT(SystemExit) PRE_INIT(KeyboardInterrupt) PRE_INIT(ImportError) + PRE_INIT(ModuleNotFoundError) PRE_INIT(OSError) PRE_INIT(EOFError) PRE_INIT(RuntimeError) @@ -2541,6 +2549,7 @@ _PyExc_Init(PyObject *bltinmod) POST_INIT(SystemExit) POST_INIT(KeyboardInterrupt) POST_INIT(ImportError) + POST_INIT(ModuleNotFoundError) POST_INIT(OSError) INIT_ALIAS(EnvironmentError, OSError) INIT_ALIAS(IOError, OSError) -- cgit v1.2.1