Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Doc/library/asyncio-eventloop.rst
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ Creating Futures and Tasks

.. method:: loop.create_future()

Create an :class:`asyncio.Future` object attached to the event loop.
Create a :class:`asyncio.Future` object attached to the event loop.

This is the preferred way to create Futures in asyncio. This lets
third-party event loops provide alternative implementations of
Expand Down Expand Up @@ -649,7 +649,7 @@ Creating network servers
* *backlog* is the maximum number of queued connections passed to
:meth:`~socket.socket.listen` (defaults to 100).

* *ssl* can be set to an :class:`~ssl.SSLContext` instance to enable
* *ssl* can be set to a :class:`~ssl.SSLContext` instance to enable
TLS over the accepted connections.

* *reuse_address* tells the kernel to reuse a local socket in
Expand Down Expand Up @@ -737,7 +737,7 @@ Creating network servers
* *sock* is a preexisting socket object returned from
:meth:`socket.accept <socket.socket.accept>`.

* *ssl* can be set to an :class:`~ssl.SSLContext` to enable SSL over
* *ssl* can be set to a :class:`~ssl.SSLContext` to enable SSL over
the accepted connections.

* *ssl_handshake_timeout* is (for an SSL connection) the time in seconds to
Expand Down Expand Up @@ -897,7 +897,7 @@ convenient.

.. versionchanged:: 3.7
Even though the method was always documented as a coroutine
method, before Python 3.7 it returned an :class:`Future`.
method, before Python 3.7 it returned a :class:`Future`.
Since Python 3.7, this is an ``async def`` method.

.. coroutinemethod:: loop.sock_connect(sock, address)
Expand Down
2 changes: 1 addition & 1 deletion Doc/library/enum.rst
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Data Types

.. method:: EnumType.__getitem__(cls, name)

Returns the Enum member in *cls* matching *name*, or raises an :exc:`KeyError`::
Returns the Enum member in *cls* matching *name*, or raises a :exc:`KeyError`::

>>> Color['BLUE']
Color.BLUE
Expand Down
4 changes: 2 additions & 2 deletions Doc/library/json.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Basic Usage

If *check_circular* is false (default: ``True``), then the circular
reference check for container types will be skipped and a circular reference
will result in an :exc:`RecursionError` (or worse).
will result in a :exc:`RecursionError` (or worse).

If *allow_nan* is false (default: ``True``), then it will be a
:exc:`ValueError` to serialize out of range :class:`float` values (``nan``,
Expand Down Expand Up @@ -432,7 +432,7 @@ Encoders and Decoders

If *check_circular* is true (the default), then lists, dicts, and custom
encoded objects will be checked for circular references during encoding to
prevent an infinite recursion (which would cause an :exc:`RecursionError`).
prevent an infinite recursion (which would cause a :exc:`RecursionError`).
Otherwise, no such check takes place.

If *allow_nan* is true (the default), then ``NaN``, ``Infinity``, and
Expand Down
4 changes: 2 additions & 2 deletions Doc/library/os.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,7 @@ features:
directories you can set the umask before invoking :func:`makedirs`. The
file permission bits of existing parent directories are not changed.

If *exist_ok* is ``False`` (the default), an :exc:`FileExistsError` is
If *exist_ok* is ``False`` (the default), a :exc:`FileExistsError` is
raised if the target directory already exists.

.. note::
Expand Down Expand Up @@ -2357,7 +2357,7 @@ features:
.. function:: rmdir(path, *, dir_fd=None)

Remove (delete) the directory *path*. If the directory does not exist or is
not empty, an :exc:`FileNotFoundError` or an :exc:`OSError` is raised
not empty, a :exc:`FileNotFoundError` or an :exc:`OSError` is raised
respectively. In order to remove whole directory trees,
:func:`shutil.rmtree` can be used.

Expand Down
2 changes: 1 addition & 1 deletion Doc/library/poplib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ POP3 Objects
All POP3 commands are represented by methods of the same name, in lowercase;
most return the response text sent by the server.

An :class:`POP3` instance has the following methods:
A :class:`POP3` instance has the following methods:


.. method:: POP3.set_debuglevel(level)
Expand Down
8 changes: 4 additions & 4 deletions Doc/library/tarfile.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ Some facts and figures:
+------------------+---------------------------------------------+
| ``'x'`` or | Create a tarfile exclusively without |
| ``'x:'`` | compression. |
| | Raise an :exc:`FileExistsError` exception |
| | Raise a :exc:`FileExistsError` exception |
| | if it already exists. |
+------------------+---------------------------------------------+
| ``'x:gz'`` | Create a tarfile with gzip compression. |
| | Raise an :exc:`FileExistsError` exception |
| | Raise a :exc:`FileExistsError` exception |
| | if it already exists. |
+------------------+---------------------------------------------+
| ``'x:bz2'`` | Create a tarfile with bzip2 compression. |
| | Raise an :exc:`FileExistsError` exception |
| | Raise a :exc:`FileExistsError` exception |
| | if it already exists. |
+------------------+---------------------------------------------+
| ``'x:xz'`` | Create a tarfile with lzma compression. |
| | Raise an :exc:`FileExistsError` exception |
| | Raise a :exc:`FileExistsError` exception |
| | if it already exists. |
+------------------+---------------------------------------------+
| ``'a' or 'a:'`` | Open for appending with no compression. The |
Expand Down