Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2015-10-28 03:15:38 -04:00
commit 549edcfa05
1 changed files with 4 additions and 4 deletions

View File

@ -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* Return true if the *object* argument is an instance of the *classinfo*
argument, or of a (direct, indirect or :term:`virtual <abstract base argument, or of a (direct, indirect or :term:`virtual <abstract base
class>`) subclass thereof. If *object* is not class>`) subclass thereof. If *object* is not
an object of the given type, the function always returns false. If an object of the given type, the function always returns false.
*classinfo* is not a class (type object), it may be a tuple of type objects, If *classinfo* is a tuple of type objects (or recursively, other such
or may recursively contain other such tuples (other sequence types are not tuples), return true if *object* is an instance of any of the types.
accepted). If *classinfo* is not a type or tuple of types and such tuples, If *classinfo* is not a type or tuple of types and such tuples,
a :exc:`TypeError` exception is raised. a :exc:`TypeError` exception is raised.