summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-10-07 20:54:12 (GMT)
committerGuido van Rossum <guido@python.org>2001-10-07 20:54:12 (GMT)
commit03290ecbf1661c0192e6abdbe00ae163af461d77 (patch)
treefc324d37b87c8d229d726f41de8dfc3bc33fda3a /Python
parent1f733baa04a56eed0a5823158205fc04502e3050 (diff)
downloadcpython-03290ecbf1661c0192e6abdbe00ae163af461d77.zip
cpython-03290ecbf1661c0192e6abdbe00ae163af461d77.tar.gz
cpython-03290ecbf1661c0192e6abdbe00ae163af461d77.tar.bz2
Implement isinstance(x, (A, B, ...)). Note that we only allow tuples,
not other sequences (then we'd have to except strings, and we'd still be susceptible to recursive attacks).
Diffstat (limited to 'Python')
-rw-r--r--Python/bltinmodule.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 64afb1b..8390b7b 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1641,10 +1641,12 @@ builtin_isinstance(PyObject *self, PyObject *args)
}
static char isinstance_doc[] =
-"isinstance(object, class-or-type) -> Boolean\n\
+"isinstance(object, class-or-type-or-tuple) -> Boolean\n\
\n\
Return whether an object is an instance of a class or of a subclass thereof.\n\
-With a type as second argument, return whether that is the object's type.";
+With a type as second argument, return whether that is the object's type.\n\
+The form using a tuple, isinstance(x, (A, B, ...)), is a shortcut for\n\
+isinstance(x, A) or isinstance(x, B) or ... (etc.).";
static PyObject *