diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-11 12:38:54 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-11 12:38:54 +0300 |
| commit | a1f5f8bc7969b5f2348f80ed296408cb8851c981 (patch) | |
| tree | 110a57f9762c84a8e5cec77bbadda20ed1f8e690 | |
| parent | 90be7333ea670277d781f04c24dbfdafb214aa8b (diff) | |
| parent | 8fafc74d45d2f6eba034ca0ff450adf12610ff18 (diff) | |
| download | cpython-git-a1f5f8bc7969b5f2348f80ed296408cb8851c981.tar.gz | |
Merge heads
| -rw-r--r-- | Doc/library/exceptions.rst | 2 | ||||
| -rw-r--r-- | 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 index ba6122e29b..5a7193393c 100644 --- 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. diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 9a51194b8a..929ceadbd7 100644 --- 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 |