[Python-checkins] cpython (merge 3.2 -> default): #13387: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/196d485ed26d
changeset:   73616:196d485ed26d
parent:      73613:116ed0ce5756
parent:      73615:583aff635ce1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 18 19:01:01 2011 +0200
summary:
  #13387: merge with 3.2.

files:
  Doc/library/unittest.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -933,6 +933,8 @@
 
       Test that *obj* is (or is not) an instance of *cls* (which can be a
       class or a tuple of classes, as supported by :func:`isinstance`).
+      To check for a specific type (without including superclasses) use
+      :func:`assertIs(type(obj), cls) <assertIs>`.
 
       .. versionadded:: 3.2
 

-- 
Repository URL: http://hg.python.org/cpython