diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-11 09:39:07 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-11 09:39:07 (GMT) |
| commit | ba416eef1852c217ba56476e950e2230653988e6 (patch) | |
| tree | 4d9a911a81d529abd21df4305d63b48a5e0756ed | |
| parent | 336fc5bbb09b1b5d34b808ce749737691aaec9b6 (diff) | |
| parent | 8e72f503b16e13ac223cebb99e0c8b76251cdc66 (diff) | |
| download | cpython-ba416eef1852c217ba56476e950e2230653988e6.zip cpython-ba416eef1852c217ba56476e950e2230653988e6.tar.gz cpython-ba416eef1852c217ba56476e950e2230653988e6.tar.bz2 | |
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 ba6122e..5a71933 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 c4dc4ed..2073f0f 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1725,7 +1725,7 @@ Methods and their defaults: * ``__ge__``: NotImplemented * ``__int__``: 1 * ``__contains__``: False -* ``__len__``: 1 +* ``__len__``: 0 * ``__iter__``: iter([]) * ``__exit__``: False * ``__complex__``: 1j |