Merge 3.2

This commit is contained in:
Éric Araujo 2012-02-26 04:07:37 +01:00
commit 408026c7e8
4 changed files with 5 additions and 4 deletions

View file

@ -1112,7 +1112,7 @@ with the :mod:`warnings` module.
If *capture* is ``True``, warnings issued by the :mod:`warnings` module will
be redirected to the logging system. Specifically, a warning will be
formatted using :func:`warnings.formatwarning` and the resulting string
logged to a logger named ``'py.warnings'`` with a severity of ``'WARNING'``.
logged to a logger named ``'py.warnings'`` with a severity of :const:`WARNING`.
If *capture* is ``False``, the redirection of warnings to the logging system
will stop, and warnings will be redirected to their original destinations