[Python-checkins] r84445 - python/branches/release27-maint/Lib/logging/handlers.py

Fri Sep 3 11:06:07 CEST 2010

Author: vinay.sajip
Date: Fri Sep 3 11:06:07 2010
New Revision: 84445
Log:
Issue #7077: Backported fix from py3k.
Modified:
 python/branches/release27-maint/Lib/logging/handlers.py
Modified: python/branches/release27-maint/Lib/logging/handlers.py
==============================================================================

--- python/branches/release27-maint/Lib/logging/handlers.py	(original)
+++ python/branches/release27-maint/Lib/logging/handlers.py	Fri Sep 3 11:06:07 2010
@@ -786,20 +786,19 @@
 The record is formatted, and then sent to the syslog server. If
 exception information is present, it is NOT sent to the server.
 """
- msg = self.format(record)
+ msg = self.format(record) + '000円'
 """
 We need to convert record level to lowercase, maybe this will
 change in the future.
 """
- msg = self.log_format_string % (
- self.encodePriority(self.facility,
- self.mapPriority(record.levelname)),
- msg)
- # Treat unicode messages as required by RFC 5424
- if _unicode and type(msg) is unicode:
+ prio = '<%d>' % self.encodePriority(self.facility,
+ self.mapPriority(record.levelname))
+ # Message is a string. Convert to bytes as required by RFC 5424
+ if type(msg) is unicode:
 msg = msg.encode('utf-8')
 if codecs:
 msg = codecs.BOM_UTF8 + msg
+ msg = prio + msg
 try:
 if self.unixsocket:
 try:
