summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-10-28 07:15:20 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-10-28 07:15:20 (GMT)
commit44b1020c121aa5511e8994496ee4e7a2ad9deb8d (patch)
tree02ff909d8fe381dc0c5794927c1a2ddaf485cd9a
parent32dcf40af0be40d2c8db08a76bb4a878bf6718d0 (diff)
parent68b6874f59d80c41785a4d4a6874be89ad08fcd5 (diff)
downloadcpython-44b1020c121aa5511e8994496ee4e7a2ad9deb8d.zip
cpython-44b1020c121aa5511e8994496ee4e7a2ad9deb8d.tar.gz
cpython-44b1020c121aa5511e8994496ee4e7a2ad9deb8d.tar.bz2
Merge with 3.4
-rw-r--r--Doc/library/functions.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 409f6c4..3c38b95 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -703,10 +703,10 @@ are always available. They are listed here in alphabetical order.
Return true if the *object* argument is an instance of the *classinfo*
argument, or of a (direct, indirect or :term:`virtual <abstract base
class>`) subclass thereof. If *object* is not
- an object of the given type, the function always returns false. If
- *classinfo* is not a class (type object), it may be a tuple of type objects,
- or may recursively contain other such tuples (other sequence types are not
- accepted). If *classinfo* is not a type or tuple of types and such tuples,
+ an object of the given type, the function always returns false.
+ If *classinfo* is a tuple of type objects (or recursively, other such
+ tuples), return true if *object* is an instance of any of the types.
+ If *classinfo* is not a type or tuple of types and such tuples,
a :exc:`TypeError` exception is raised.