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

Mon Apr 11 05:39:54 EDT 2016

https://hg.python.org/cpython/rev/9520682b928d
changeset: 100924:9520682b928d
branch: 3.5
parent: 100920:ce721df212cf
parent: 100918:83f267ffb862
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Apr 11 12:38:54 2016 +0300
summary:
 Merge heads
files:
 Doc/library/exceptions.rst | 2 +-
 Doc/library/unittest.mock.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -288,7 +288,7 @@
 
 .. versionchanged:: 3.3
 :exc:`EnvironmentError`, :exc:`IOError`, :exc:`WindowsError`,
- :exc:`VMSError`, :exc:`socket.error`, :exc:`select.error` and
+ :exc:`socket.error`, :exc:`select.error` and
 :exc:`mmap.error` have been merged into :exc:`OSError`, and the
 constructor may return a subclass.
 
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
@@ -1697,7 +1697,7 @@
 * ``__ge__``: NotImplemented
 * ``__int__``: 1
 * ``__contains__``: False
-* ``__len__``: 1
+* ``__len__``: 0
 * ``__iter__``: iter([])
 * ``__exit__``: False
 * ``__complex__``: 1j
-- 
Repository URL: https://hg.python.org/cpython
