[Python-checkins] [2.7] bpo-33943: Add references in the docs for logging.basicConfig (GH-7858) (GH-7902)
Tal Einat
webhook-mailer at python.org
Mon Jun 25 02:52:39 EDT 2018
https://github.com/python/cpython/commit/aa770b7096c004abdf3c27bc361d6b60a4b668af
commit: aa770b7096c004abdf3c27bc361d6b60a4b668af
branch: 2.7
author: Tal Einat <taleinat+github at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-06-25T09:52:35+03:00
summary:
[2.7] bpo-33943: Add references in the docs for logging.basicConfig (GH-7858) (GH-7902)
Adds references to info about file modes, `time.strftime()`, string formatting
syntaxes, and logging levels.
(cherry picked from commit a8ddf85a84364d2c660e6670a7e06621993d1fdc)
Co-authored-by: Andrés Delfino <adelfino at gmail.com>
files:
M Doc/library/logging.rst
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 0f568aaa9760..09cae18cfde4 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -949,26 +949,26 @@ functions.
+--------------+---------------------------------------------+
| Format | Description |
+==============+=============================================+
- | ``filename`` | Specifies that a FileHandler be created, |
+ | *filename* | Specifies that a FileHandler be created, |
| | using the specified filename, rather than a |
| | StreamHandler. |
+--------------+---------------------------------------------+
- | ``filemode`` | Specifies the mode to open the file, if |
- | | filename is specified (if filemode is |
- | | unspecified, it defaults to 'a'). |
+ | *filemode* | If *filename* is specified, open the file |
+ | | in this mode. Defaults to ``'a'``. |
+--------------+---------------------------------------------+
- | ``format`` | Use the specified format string for the |
+ | *format* | Use the specified format string for the |
| | handler. |
+--------------+---------------------------------------------+
- | ``datefmt`` | Use the specified date/time format. |
+ | *datefmt* | Use the specified date/time format, as |
+ | | accepted by :func:`time.strftime`. |
+--------------+---------------------------------------------+
- | ``level`` | Set the root logger level to the specified |
- | | level. |
+ | *level* | Set the root logger level to the specified |
+ | | :ref:`level <levels>`. |
+--------------+---------------------------------------------+
- | ``stream`` | Use the specified stream to initialize the |
+ | *stream* | Use the specified stream to initialize the |
| | StreamHandler. Note that this argument is |
- | | incompatible with 'filename' - if both are |
- | | present, 'stream' is ignored. |
+ | | incompatible with *filename* - if both are |
+ | | present, *stream* is ignored. |
+--------------+---------------------------------------------+
More information about the Python-checkins
mailing list