[Python-checkins] Remove unneeded PyErr_Clear() calls after PyErr_Print(). (GH-8699)

Serhiy Storchaka webhook-mailer at python.org
Tue Aug 7 10:27:03 EDT 2018


https://github.com/python/cpython/commit/8b58468032b8f87993a121c2b43f52648382a529
commit: 8b58468032b8f87993a121c2b43f52648382a529
branch: master
author: Zackery Spytz <zspytz at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2018-08-07T17:26:58+03:00
summary:

Remove unneeded PyErr_Clear() calls after PyErr_Print(). (GH-8699)

PyErr_Print() always clears the error indicator, so there is no need
to call PyErr_Clear() immediately afterwards.

files:
M Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index da3441f3c96e..1640758fd01a 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -185,7 +185,6 @@ pymain_run_interactive_hook(void)
 error:
     PySys_WriteStderr("Failed calling sys.__interactivehook__\n");
     PyErr_Print();
-    PyErr_Clear();
 }
 
 
@@ -267,7 +266,6 @@ pymain_get_importer(const wchar_t *filename)
     Py_XDECREF(sys_path0);
     PySys_WriteStderr("Failed checking if argv[0] is an import path entry\n");
     PyErr_Print();
-    PyErr_Clear();
     return NULL;
 }
 
@@ -1081,7 +1079,6 @@ pymain_run_startup(_PyMain *pymain, _PyCoreConfig *config, PyCompilerFlags *cf)
         PyErr_SetFromErrnoWithFilename(PyExc_OSError,
                         startup);
         PyErr_Print();
-        PyErr_Clear();
         return;
     }
 



More information about the Python-checkins mailing list