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

[serhiy.storchaka]

https://hg.python.org/cpython/rev/f049f9ee82a5
changeset:   106097:f049f9ee82a5
branch:      3.6
parent:      106093:aad038e8dfef
parent:      106096:398b73dbb1a0
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Jan 11 20:17:34 2017 +0200
summary:
  Merge with 3.5.

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


diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -1831,6 +1831,9 @@
     the same attribute will always return the same object. The objects
     returned have a sensible repr so that test failure messages are readable.
 
+    The ``sentinel`` attributes don't preserve their identity when they are
+    :mod:`copied <copy>` or :mod:`pickled <pickle>`.
+
 Sometimes when testing you need to test that a specific object is passed as an
 argument to another method, or returned. It can be common to create named
 sentinel objects to test this. :data:`sentinel` provides a convenient way of

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