mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix mismerges of version directives.

Browse source
This commit is contained in:
Georg Brandl 2010-11-26 08:58:14 +00:00
parent 3fd9ef8f65
commit 241efded1d
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/library/syslog.rst
View file

@ -43,11 +43,6 @@ The module defines the following functions:
keyword argument (default is :const:`LOG_USER`) sets the default facility for keyword argument (default is :const:`LOG_USER`) sets the default facility for
messages which do not have a facility explicitly encoded. 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() .. function:: closelog()

7
Doc/library/warnings.rst
View file

@ -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 the command-line options passed to :option:`-W` and calls to
:func:`filterwarnings`. :func:`filterwarnings`.
* :exc:`DeprecationWarning` and :exc:`PendingDeprecationWarning`, and * :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` are ignored.
:exc:`ImportWarning` are ignored.
* :exc:`BytesWarning` is ignored unless the :option:`-b` option is given once or * :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 twice; in this case this warning is either printed (``-b``) or turned into an
exception (``-bb``). exception (``-bb``).
.. versionchanged:: 3.2
:exc:`DeprecationWarning` is now ignored by default in addition to
:exc:`PendingDeprecationWarning`.
.. _warning-suppress: .. _warning-suppress: