diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 08:58:14 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 08:58:14 (GMT) |
| commit | 241efded1d1d66e326b134a871a10e076914b3a2 (patch) | |
| tree | 4f212d774fce13026765d24d0d3b98cebd2319cd | |
| parent | 3fd9ef8f65820d155282d286408479228aa207b0 (diff) | |
| download | cpython-241efded1d1d66e326b134a871a10e076914b3a2.zip cpython-241efded1d1d66e326b134a871a10e076914b3a2.tar.gz cpython-241efded1d1d66e326b134a871a10e076914b3a2.tar.bz2 | |
Fix mismerges of version directives.
| -rw-r--r-- | Doc/library/syslog.rst | 5 | ||||
| -rw-r--r-- | Doc/library/warnings.rst | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst index a3b374a..7b1a340 100644 --- a/Doc/library/syslog.rst +++ b/Doc/library/syslog.rst @@ -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() diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index 5b6e6af..544d9f7 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -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: |