diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-11-24 23:24:17 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-11-24 23:24:17 (GMT) |
| commit | e5beb3da00d4d66d9af70eb97540e4f853d3f0d9 (patch) | |
| tree | 9b8932e29c6cdbd4f21b44466ad0ae4f53b62493 /Doc | |
| parent | f65dd1d4db088ab2a12430f1b6d43e8f1ed04e18 (diff) | |
| parent | 46cc4a8f320d252c12edeeaae1f0ac87b155399d (diff) | |
| download | cpython-e5beb3da00d4d66d9af70eb97540e4f853d3f0d9.zip cpython-e5beb3da00d4d66d9af70eb97540e4f853d3f0d9.tar.gz cpython-e5beb3da00d4d66d9af70eb97540e4f853d3f0d9.tar.bz2 | |
Closes #25508: Merged documentation fix from 3.5.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/logging.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index bf821ab..5bc72f7 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -743,7 +743,9 @@ the options available to you. | Attribute name | Format | Description | +================+=========================+===============================================+ | args | You shouldn't need to | The tuple of arguments merged into ``msg`` to | -| | format this yourself. | produce ``message``. | +| | format this yourself. | produce ``message``, or a dict whose values | +| | | are used for the merge (when there is only one| +| | | argument, and it is a dictionary). | +----------------+-------------------------+-----------------------------------------------+ | asctime | ``%(asctime)s`` | Human-readable time when the | | | | :class:`LogRecord` was created. By default | |