Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-34065: Improve the markup of logging.basicConfig() arguments (GH-8153)

This commit is contained in:
Dong-hee Na 2018-07-07 21:36:40 +09:00 committed by Serhiy Storchaka
parent 4629c0d531
commit 2800dcf656
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Doc/library/logging.rst
View File

@ -1186,25 +1186,24 @@ functions.
| | with *filename* or *stream* - if both | | | with *filename* or *stream* - if both |
| | are present, a ``ValueError`` is raised. | | | are present, a ``ValueError`` is raised. |
+--------------+---------------------------------------------+ +--------------+---------------------------------------------+
| ``force`` | If this keyword argument is specified as | | *force* | If this keyword argument is specified as |
| | true, any existing handlers attached to the | | | true, any existing handlers attached to the |
| | root logger are removed and closed, before | | | root logger are removed and closed, before |
| | carrying out the configuration as specified | | | carrying out the configuration as specified |
| | by the other arguments. | | | by the other arguments. |
+--------------+---------------------------------------------+ +--------------+---------------------------------------------+
.. versionchanged:: 3.8
The ``force`` argument was added.
.. versionchanged:: 3.2 .. versionchanged:: 3.2
The ``style`` argument was added. The *style* argument was added.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
The ``handlers`` argument was added. Additional checks were added to The *handlers* argument was added. Additional checks were added to
catch situations where incompatible arguments are specified (e.g. catch situations where incompatible arguments are specified (e.g.
``handlers`` together with ``stream`` or ``filename``, or ``stream`` *handlers* together with *stream* or *filename*, or *stream*
together with ``filename``). together with *filename*).
.. versionchanged:: 3.8
The *force* argument was added.
.. function:: shutdown() .. function:: shutdown()

1
Misc/NEWS.d/next/Documentation/2018-07-07-20-38-41.bpo-34065.1snofM.rst Normal file
View File

@ -0,0 +1 @@
Fix wrongly written basicConfig documentation markup syntax