diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-26 03:07:37 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-26 03:07:37 (GMT) |
| commit | 408026c7e8c019cf04372a4267c832241e18c62c (patch) | |
| tree | 4fcb98a84a03a0234306d716c45af02d9b38788e /Doc | |
| parent | dfac6cc3e9df2a7352aaad3bb36390f850fc8ee6 (diff) | |
| parent | f527277b678b263b9d2f5ab52fb804fd1f62cde3 (diff) | |
| download | cpython-408026c7e8c019cf04372a4267c832241e18c62c.zip cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.gz cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/logging.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 206b5f6..0979278 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -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 |