Use PyErr_ExceptionMatches(...) instead of PyErr_Occurred() == ... in two

places.

Use PyErr_ExceptionMatches(...) instead of PyErr_Occurred() == ... in two
places.
764b984d · Fred Drake · 2b9d0293 · 764b984d
Commit 764b984d authored May 28, 1998 by Fred Drake
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Modules/cPickle.c Modules/cPickle.c +4 -2

No files found.
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -3533,7 +3533,8 @@ load(Unpicklerobject *self) {
        break;
    }

-    if ((err = PyErr_Occurred()) == PyExc_EOFError) {
+    err = PyErr_Occurred();
+    if (err && PyErr_ExceptionMatches(PyExc_EOFError)) {
        PyErr_SetNone(PyExc_EOFError);
        goto err;
    }    
@@ -3830,7 +3831,8 @@ noload(Unpicklerobject *self) {
        break;
    }

-    if ((err = PyErr_Occurred()) == PyExc_EOFError) {
+    err = PyErr_Occurred();
+    if (err && PyErr_ExceptionMatches(PyExc_EOFError)) {
        PyErr_SetNone(PyExc_EOFError);
        goto err;
    }