From: Armin Rigo <arigo@tunes.org>
Date: Mon, 22 Mar 2004 20:39:42 +0000 (+0000)
Subject: Backported fix of revision 2.217.
X-Git-Tag: v2.3.4c1~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42b2cbcb621797d1331bbb9141c363910b4c13b1;p=thirdparty%2FPython%2Fcpython.git

Backported fix of revision 2.217.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 13185d8fd7f6..4d83a6d1eb88 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2078,7 +2078,7 @@ recursive_isinstance(PyObject *inst, PyObject *cls, int recursion_depth)
                 if (!recursion_depth) {
                     PyErr_SetString(PyExc_RuntimeError,
                                     "Recursion depth exceeded");
-                    return NULL;
+                    return -1;
                 }
 
 		n = PyTuple_GET_SIZE(cls);
@@ -2138,7 +2138,7 @@ recursive_issubclass(PyObject *derived, PyObject *cls, int recursion_depth)
                         if (!recursion_depth) {
                             PyErr_SetString(PyExc_RuntimeError,
                                             "Recursion depth exceeded");
-                            return NULL;
+                            return -1;
                         }
                         
 			for (i = 0; i < n; ++i) {