Fix mismerges of version directives.
This commit is contained in:
parent
3fd9ef8f65
commit
241efded1d
|
@ -43,11 +43,6 @@ The module defines the following functions:
|
|||
keyword argument (default is :const:`LOG_USER`) sets the default facility for
|
||||
messages which do not have a facility explicitly encoded.
|
||||
|
||||
.. versionchanged:: 3.2
|
||||
In previous versions, keyword arguments were not allowed, and *ident* was
|
||||
required. The default for *ident* was dependent on the system libraries,
|
||||
and often was ``python`` instead of the name of the python program file.
|
||||
|
||||
|
||||
.. function:: closelog()
|
||||
|
||||
|
|
|
@ -159,17 +159,12 @@ By default, Python installs several warning filters, which can be overridden by
|
|||
the command-line options passed to :option:`-W` and calls to
|
||||
:func:`filterwarnings`.
|
||||
|
||||
* :exc:`DeprecationWarning` and :exc:`PendingDeprecationWarning`, and
|
||||
:exc:`ImportWarning` are ignored.
|
||||
* :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` are ignored.
|
||||
|
||||
* :exc:`BytesWarning` is ignored unless the :option:`-b` option is given once or
|
||||
twice; in this case this warning is either printed (``-b``) or turned into an
|
||||
exception (``-bb``).
|
||||
|
||||
.. versionchanged:: 3.2
|
||||
:exc:`DeprecationWarning` is now ignored by default in addition to
|
||||
:exc:`PendingDeprecationWarning`.
|
||||
|
||||
|
||||
.. _warning-suppress:
|
||||
|
||||
|
|
Loading…
Reference in New Issue