From 5cc4e2a04035ff823930aa39d88fb6678654637e Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 11 Dec 2009 09:16:01 +0000 Subject: [PATCH] Issue #7470: logging: fix bug in Unicode encoding fallback. --- Lib/logging/__init__.py | 6 +++--- Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 3f8cf05b12d..e0d62813131 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -821,9 +821,9 @@ class StreamHandler(Handler): try: if (isinstance(msg, unicode) and getattr(stream, 'encoding', None)): - fs = fs.decode(stream.encoding) + ufs = fs.decode(stream.encoding) try: - stream.write(fs % msg) + stream.write(ufs % msg) except UnicodeEncodeError: #Printing to terminals sometimes fails. For example, #with an encoding of 'cp1251', the above write will @@ -831,7 +831,7 @@ class StreamHandler(Handler): #the codecs module, but fail when writing to a #terminal even when the codepage is set to cp1251. #An extra encoding step seems to be needed. - stream.write((fs % msg).encode(stream.encoding)) + stream.write((ufs % msg).encode(stream.encoding)) else: stream.write(fs % msg) except UnicodeError: diff --git a/Misc/NEWS b/Misc/NEWS index e4c39185082..38640a7940a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,8 @@ Core and Builtins Library ------- +- Issue #7470: logging: fix bug in Unicode encoding fallback. + - Issue #5949: fixed IMAP4_SSL hang when the IMAP server response is missing proper end-of-line termination.