[Python-checkins] cpython (merge 3.5 -> default): Closes #25508: Merged documentation fix from 3.5.
vinay.sajip
python-checkins at python.org
Tue Nov 24 18:24:30 EST 2015
https://hg.python.org/cpython/rev/1da622f4630b
changeset: 99337:1da622f4630b
parent: 99333:671429cc1d96
parent: 99336:ca512b568368
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Tue Nov 24 23:24:17 2015 +0000
summary:
Closes #25508: Merged documentation fix from 3.5.
files:
Doc/library/logging.rst | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -743,7 +743,9 @@
| 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 |
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list