summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2009-10-21 20:22:14 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2009-10-21 20:22:14 +0000
commit42ead48dc17543c0d41d261fdf070a07f576c449 (patch)
tree960a58e16b341fb10de9787551a1636ed913e4ce
parentff8c1e5aceb7737d424610dd1adeed773b84b8db (diff)
downloadcpython-git-42ead48dc17543c0d41d261fdf070a07f576c449.tar.gz
Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424.
-rw-r--r--Lib/logging/handlers.py4
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 2d71470ceb..2437c341af 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -779,6 +779,10 @@ class SysLogHandler(logging.Handler):
self.encodePriority(self.facility,
self.mapPriority(record.levelname)),
msg)
+ #Message is a string. Convert to bytes as required by RFC 5424
+ msg = msg.encode('utf-8')
+ if codecs:
+ msg = codecs.BOM_UTF8 + msg
try:
if self.unixsocket:
try:
diff --git a/Misc/NEWS b/Misc/NEWS
index 8984e6fb03..96ee2ac611 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -104,6 +104,8 @@ C-API
Library
-------
+- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424.
+
- Issue #7099: Decimal.is_normal now returns True for numbers with exponent
larger than emax.