Move caching to pgSurface_UnlockBy

Author: oddbookworm

src_c/pixelcopy.c

@@ -815,14 +815,8 @@ surface_to_array(PyObject *self, PyObject *args, PyObject *kwds)
     if (view_p->ndim == 2) {
         if (view_kind == VIEWKIND_RGB) {
             if (_copy_mapped(view_p, surf)) {
-                int error_occurred = (PyErr_Occurred() != NULL);
-                if (error_occurred) {
-                    CACHE_EXCEPTION
-                }
                 pgBuffer_Release(&pg_view);
                 pgSurface_Unlock(surfobj);
-                if (error_occurred)
-                    RESTORE_EXCEPTION
                 return 0;
             }
         }
@@ -1164,10 +1158,7 @@ map_array(PyObject *self, PyObject *args)
     if (is_tar_alloc) {
         pgBuffer_Release(&tar_pg_view);
     }
-    CACHE_EXCEPTION
-    PyErr_Clear();
     pgSurface_Unlock(format_surf);
-    RESTORE_EXCEPTION
     return 0;
 }
 

src_c/surflock.c

@@ -131,13 +131,16 @@ pgSurface_UnlockBy(pgSurfaceObject *surfobj, PyObject *lockobj)
             }
             if (weakref_getref_result == 1) {
                 if (ref == lockobj) {
+                    CACHE_EXCEPTION
                     if (PySequence_DelItem(surf->locklist, len) == -1) {
                         Py_DECREF(ref);
+                        RESTORE_EXCEPTION
                         return 0;
                     }
                     else {
                         found = 1;
                     }
+                    RESTORE_EXCEPTION
                 }
                 Py_DECREF(ref);
             }
@@ -153,12 +156,14 @@ pgSurface_UnlockBy(pgSurfaceObject *surfobj, PyObject *lockobj)
                 noerror = 0;
             }
             else if (weakref_getref_result == 0) {
+                CACHE_EXCEPTION
                 if (PySequence_DelItem(surf->locklist, len) == -1) {
                     noerror = 0;
                 }
                 else {
                     found++;
                 }
+                RESTORE_EXCEPTION
             }
             else if (weakref_getref_result == 1) {
                 Py_DECREF(ref);