[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4

Wed Oct 28 03:16:03 EDT 2015

https://hg.python.org/cpython/rev/fea528e2dc26
changeset: 98874:fea528e2dc26
branch: 3.5
parent: 98870:2dd97ad96021
parent: 98873:8b1418e5dcc8
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Oct 28 03:15:20 2015 -0400
summary:
 Merge with 3.4
files:
 Doc/library/functions.rst | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -703,10 +703,10 @@
 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.
 
 
-- 
Repository URL: https://hg.python.org/cpython
