From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 7 Oct 2005 08:35:36 +0000 (+0000)
Subject: Fixed bug where the logging message was wrongly being demoted from Unicode to string... 
X-Git-Tag: v2.5a0~1300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43d6e812c886db6f4eae19598b0b864e9cbc3d52;p=thirdparty%2FPython%2Fcpython.git

Fixed bug where the logging message was wrongly being demoted from Unicode to string (SF #1314107)
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 4dab918c8523..db7029321d30 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -41,8 +41,8 @@ except ImportError:
 
 __author__  = "Vinay Sajip <vinay_sajip@red-dove.com>"
 __status__  = "beta"
-__version__ = "0.4.9.6"
-__date__    = "27 March 2005"
+__version__ = "0.4.9.7"
+__date__    = "07 October 2005"
 
 #---------------------------------------------------------------------------
 #   Miscellaneous module data
@@ -266,10 +266,12 @@ class LogRecord:
         if not hasattr(types, "UnicodeType"): #if no unicode support...
             msg = str(self.msg)
         else:
-            try:
-                msg = str(self.msg)
-            except UnicodeError:
-                msg = self.msg      #Defer encoding till later
+            msg = self.msg
+            if type(msg) not in (types.UnicodeType, types.StringType):
+                try:
+                    msg = str(self.msg)
+                except UnicodeError:
+                    msg = self.msg      #Defer encoding till later
         if self.args:
             msg = msg % self.args
         return msg