ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge heads

Browse source
This commit is contained in:
Serhiy Storchaka 2016-04-11 12:39:07 +03:00
commit ba416eef18
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/exceptions.rst
View file

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

2
Doc/library/unittest.mock.rst
View file

@ -1725,7 +1725,7 @@ Methods and their defaults:
* ``__ge__``: NotImplemented
* ``__int__``: 1
* ``__contains__``: False
* ``__len__``: 1
* ``__len__``: 0
* ``__iter__``: iter([])
* ``__exit__``: False
* ``__complex__``: 1j