Merged documentation update from 3.3.

This commit is contained in:
Vinay Sajip 2014-01-15 13:29:24 +00:00
commit 6ed2893aae

View file

@ -1002,14 +1002,15 @@ functions.
Logs a message with level *level* on the root logger. The other arguments are Logs a message with level *level* on the root logger. The other arguments are
interpreted as for :func:`debug`. interpreted as for :func:`debug`.
.. note:: The above module-level functions which delegate to the root .. note:: The above module-level convenience functions, which delegate to the
logger should *not* be used in threads, in versions of Python earlier root logger, call :func:`basicConfig` to ensure that at least one handler
than 2.7.1 and 3.2, unless at least one handler has been added to the is available. Because of this, they should *not* be used in threads,
root logger *before* the threads are started. These convenience functions in versions of Python earlier than 2.7.1 and 3.2, unless at least one
call :func:`basicConfig` to ensure that at least one handler is handler has been added to the root logger *before* the threads are
available; in earlier versions of Python, this can (under rare started. In earlier versions of Python, due to a thread safety shortcoming
circumstances) lead to handlers being added multiple times to the root in :func:`basicConfig`, this can (under rare circumstances) lead to
logger, which can in turn lead to multiple messages for the same event. handlers being added multiple times to the root logger, which can in turn
lead to multiple messages for the same event.
.. function:: disable(lvl) .. function:: disable(lvl)