summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2015-11-24 23:21:15 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2015-11-24 23:21:15 (GMT)
commit4f44d53770c42818a4d8ca4036e2602fff3a7c88 (patch)
treeebc904400e2e60965f0600dab556bda91fd9f9a3 /Doc
parentcda85a0d1ca217c927211af799072c85b04b4e89 (diff)
downloadcpython-4f44d53770c42818a4d8ca4036e2602fff3a7c88.zip
cpython-4f44d53770c42818a4d8ca4036e2602fff3a7c88.tar.gz
cpython-4f44d53770c42818a4d8ca4036e2602fff3a7c88.tar.bz2
Issue #25508: Clarify documentation on LogRecord args attribute.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/logging.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 90fb9b0..8fd7e40 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -738,7 +738,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 |