Merge heads

a1f5f8bc · Serhiy Storchaka · 90be7333 · 8fafc74d · a1f5f8bc · a1f5f8bc
Commit a1f5f8bc authored Apr 11, 2016 by Serhiy Storchaka
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/exceptions.rst Doc/library/exceptions.rst +1 -1

Doc/library/unittest.mock.rst Doc/library/unittest.mock.rst +1 -1

No files found.
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -288,7 +288,7 @@ The following exceptions are the exceptions that are usually raised.

   .. 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.


--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -1697,7 +1697,7 @@ Methods and their defaults:
 * ``__ge__``: NotImplemented
 * ``__int__``: 1
 * ``__contains__``: False
-* ``__len__``: 1
+* ``__len__``: 0
 * ``__iter__``: iter([])
 * ``__exit__``: False
 * ``__complex__``: 1j