From: Guido van Rossum <guido@python.org>
Date: Thu, 8 Apr 1993 12:56:19 +0000 (+0000)
Subject: Fix bug in class instance hash (forgot to clear error condition).
X-Git-Tag: v0.9.9~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a0c3456c2020d1a1f87619c4651e4eab831938a;p=thirdparty%2FPython%2Fcpython.git

Fix bug in class instance hash (forgot to clear error condition).
---

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 823e397f7955..587d122aeedc 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -317,7 +317,7 @@ instance_hash(inst)
 {
 	object *func;
 	object *res;
-	int outcome;
+	long outcome;
 
 	func = instance_getattr(inst, "__hash__");
 	if (func == NULL) {
@@ -325,8 +325,13 @@ instance_hash(inst)
 		   If a __cmp__ method exists, there must be a __hash__. */
 		err_clear();
 		func = instance_getattr(inst, "__cmp__");
-		if (func == NULL)
-			return (long)inst;
+		if (func == NULL) {
+			err_clear();
+			outcome = (long)inst;
+			if (outcome == -1)
+				outcome = -2;
+			return outcome;
+		}
 		err_setstr(TypeError, "unhashable instance");
 		return -1;
 	}