From: Zackery Spytz <zspytz@gmail.com>
Date: Tue, 7 Aug 2018 14:26:58 +0000 (-0600)
Subject: Remove unneeded PyErr_Clear() calls after PyErr_Print(). (GH-8699)
X-Git-Tag: v3.8.0a1~1234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b58468032b8f87993a121c2b43f52648382a529;p=thirdparty%2FPython%2Fcpython.git

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.
---

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 @@ error:
     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;
     }