From 20f2ee94396695c858b14305277be65ef9079b72 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 27 Oct 2009 14:10:28 +0000 Subject: [PATCH] Merged revisions 71094,71102-71103,71106,71486,71962,72053,72221,72418-72419 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71094 | vinay.sajip | 2009-04-03 12:23:18 +0200 (Fr, 03 Apr 2009) | 1 line Added warning about logging use from asynchronous signal handlers. ........ r71102 | andrew.kuchling | 2009-04-03 23:44:49 +0200 (Fr, 03 Apr 2009) | 1 line Fix 'the the'; grammar fix ........ r71103 | andrew.kuchling | 2009-04-03 23:45:29 +0200 (Fr, 03 Apr 2009) | 1 line Fix 'the the' duplication ........ r71106 | vinay.sajip | 2009-04-03 23:58:16 +0200 (Fr, 03 Apr 2009) | 1 line Clarified warning about logging use from asynchronous signal handlers. ........ r71486 | andrew.kuchling | 2009-04-11 18:18:14 +0200 (Sa, 11 Apr 2009) | 1 line Re-word ........ r71962 | eric.smith | 2009-04-26 12:05:11 +0200 (So, 26 Apr 2009) | 1 line Note that the caller is resposible for freeing the result of PyOS_double_to_string. ........ r72053 | raymond.hettinger | 2009-04-27 23:12:54 +0200 (Mo, 27 Apr 2009) | 1 line Add example to the seealso section. ........ r72221 | benjamin.peterson | 2009-05-02 22:26:53 +0200 (Sa, 02 Mai 2009) | 1 line add myself ........ r72418 | r.david.murray | 2009-05-07 03:39:25 +0200 (Do, 07 Mai 2009) | 3 lines Document how to pass a 'decode' argument to get_payload when is_multipart is False. ........ r72419 | r.david.murray | 2009-05-07 03:43:57 +0200 (Do, 07 Mai 2009) | 2 lines Revert inappropriate doc change. ........ --- Doc/library/2to3.rst | 1 + Doc/library/difflib.rst | 11 +++++++++-- Doc/library/logging.rst | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index db60a762326..a959d67c945 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -345,6 +345,7 @@ and off individually. They are described here in more detail. :synopsis: the 2to3 library .. moduleauthor:: Guido van Rossum .. moduleauthor:: Collin Winter +.. moduleauthor:: Benjamin Peterson .. note:: diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst index addd813564b..d749e145829 100644 --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -577,8 +577,15 @@ If you want to know how to change the first sequence into the second, use insert a[8:8] b[8:17] equal a[8:29] b[17:38] -See also the function :func:`get_close_matches` in this module, which shows how -simple code building on :class:`SequenceMatcher` can be used to do useful work. +.. seealso:: + + * The :func:`get_close_matches` function in this module which shows how + simple code building on :class:`SequenceMatcher` can be used to do useful + work. + + * `Simple version control recipe + `_ for a small application + built with :class:`SequenceMatcher`. .. _differ-objects: diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index f79b627efd6..3e648f826be 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -2316,6 +2316,10 @@ needing to be done by its clients. It achieves this though using threading locks; there is one lock to serialize access to the module's shared data, and each handler also creates a lock to serialize access to its underlying I/O. +If you are implementing asynchronous signal handlers using the :mod:`signal` +module, you may not be able to use logging from within such handlers. This is +because lock implementations in the :mod:`threading` module are not always +re-entrant, and so cannot be invoked from such signal handlers. Configuration -------------