From: Michael W. Hudson <mwh@python.net>
Date: Tue, 24 Sep 2002 11:11:12 +0000 (+0000)
Subject: backport theller's checkin of
X-Git-Tag: v2.2.2b1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=378d36197c2f813444760ef8661ab4329703e5b7;p=thirdparty%2FPython%2Fcpython.git

backport theller's checkin of
    revision 2.102 of abstract.c

Better isinstance error message.

Closes SF patch # 560250.

Bugfix candidate IMO.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 30c69e8c9746..047f62f017b9 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1980,7 +1980,8 @@ PyObject_IsInstance(PyObject *inst, PyObject *cls)
 			/* Do not mask errors. */
 			if (!PyErr_Occurred())
 				PyErr_SetString(PyExc_TypeError,
-				"isinstance() arg 2 must be a class or type");
+				"isinstance() arg 2 must be a class, type,"
+				" or tuple of classes and types");
 			return -1;
 		}
 		Py_DECREF(cls_bases);