summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2012-04-16 23:41:39 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2012-04-16 23:41:39 (GMT)
commitf138f8c1ab94618402c80c602d3d31acb0ac6910 (patch)
tree608be54ab2639cf2b260f9578ac6c89678ee3af8 /Doc
parentbded89449914d58262e42a576d294921757d3755 (diff)
parent62930e1cc56289bf27df234b2cc01da09958c5b4 (diff)
downloadcpython-f138f8c1ab94618402c80c602d3d31acb0ac6910.zip
cpython-f138f8c1ab94618402c80c602d3d31acb0ac6910.tar.gz
cpython-f138f8c1ab94618402c80c602d3d31acb0ac6910.tar.bz2
Merged cookbook corrections from 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/logging-cookbook.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index de93432..621fdcb 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1581,14 +1581,14 @@ following structure: an optional pure-ASCII component, followed by a UTF-8 Byte
Order Mark (BOM), followed by Unicode encoded using UTF-8. (See the `relevant
section of the specification <http://tools.ietf.org/html/rfc5424#section-6>`_.)
-In Python 2.6 and 2.7, code was added to
+In Python 3.1, code was added to
:class:`~logging.handlers.SysLogHandler` to insert a BOM into the message, but
unfortunately, it was implemented incorrectly, with the BOM appearing at the
beginning of the message and hence not allowing any pure-ASCII component to
appear before it.
As this behaviour is broken, the incorrect BOM insertion code is being removed
-from Python 2.7.4 and later. However, it is not being replaced, and if you
+from Python 3.2.4 and later. However, it is not being replaced, and if you
want to produce RFC 5424-compliant messages which includes a BOM, an optional
pure-ASCII sequence before it and arbitrary Unicode after it, encoded using
UTF-8, then you need to do the following: