diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-11-24 23:22:48 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-11-24 23:22:48 (GMT) |
| commit | 46cc4a8f320d252c12edeeaae1f0ac87b155399d (patch) | |
| tree | b65bcb421c7d913fd5ac9b3813e209114d44a375 /Doc/library/logging.rst | |
| parent | f7e8d07538a1734bdb0438ab53e0a54db456d4d9 (diff) | |
| parent | 4f44d53770c42818a4d8ca4036e2602fff3a7c88 (diff) | |
| download | cpython-46cc4a8f320d252c12edeeaae1f0ac87b155399d.zip cpython-46cc4a8f320d252c12edeeaae1f0ac87b155399d.tar.gz cpython-46cc4a8f320d252c12edeeaae1f0ac87b155399d.tar.bz2 | |
Issue #25508: Merged documentation fix from 3.4.
Diffstat (limited to 'Doc/library/logging.rst')
| -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 | |