From: Fred Drake <fdrake@acm.org>
Date: Thu, 28 May 1998 04:33:37 +0000 (+0000)
Subject: Use PyErr_ExceptionMatches(...) instead of PyErr_Occurred() == ... in two
X-Git-Tag: v1.5.2a1~541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=764b984db508f40d7add9162920681827f3f22d5;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 9f426cc10527..6c70ad9cb49d 100644
--- 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;
     }