[Bf-blender-cvs] [a821a2db3d5] blender-v3.2-release: Cleanup: remove redundant PyErr_Clear calls after PyErr_Fetch

Campbell Barton noreply at git.blender.org
Tue May 3 10:23:30 CEST 2022


Commit: a821a2db3d5e4c5a302de677a127a662942c46ae
Author: Campbell Barton
Date:   Tue May 3 17:52:11 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rBa821a2db3d5e4c5a302de677a127a662942c46ae

Cleanup: remove redundant PyErr_Clear calls after PyErr_Fetch

===================================================================

M	source/blender/python/generic/py_capi_utils.c
M	source/blender/python/intern/bpy_rna.c

===================================================================

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 7a8c320c39d..3b64fb23460 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -869,8 +869,6 @@ PyObject *PyC_ExceptionBuffer(void)
 
   PyErr_Fetch(&error_type, &error_value, &error_traceback);
 
-  PyErr_Clear();
-
   /* import io
    * string_io = io.StringIO()
    */
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index c67f0c028cf..83e14c305bc 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -4542,7 +4542,6 @@ static PyObject *pyrna_prop_collection_getattro(BPy_PropertyRNA *self, PyObject
 
         PyObject *error_type, *error_value, *error_traceback;
         PyErr_Fetch(&error_type, &error_value, &error_traceback);
-        PyErr_Clear();
 
         cls = pyrna_struct_Subtype(&r_ptr);
         ret = PyObject_GenericGetAttr(cls, pyname);
@@ -7937,8 +7936,6 @@ StructRNA *srna_from_self(PyObject *self, const char *error_prefix)
   StructRNA *srna;
 
   PyErr_Fetch(&error_type, &error_value, &error_traceback);
-  PyErr_Clear();
-
   srna = pyrna_struct_as_srna(self, false, error_prefix);
 
   if (!PyErr_Occurred()) {



More information about the Bf-blender-cvs mailing list