Merge pull request #31 from enthought/fix-unicode-splash-screen-handler

Fix SplashScreenLogHandler with unicode messages

pyface/splash_screen_log_handler.py

@@ -35,7 +35,7 @@ def __init__(self, splash_screen):
     def emit(self, record):
         """ Emits the log record. """
 
-        self._splash_screen.text = str(record.getMessage()) + '...'
+        self._splash_screen.text = unicode(record.getMessage()) + u'...'
 
         return
 

pyface/tests/test_splash_screen_log_handler.py

@@ -0,0 +1,36 @@
+from __future__ import absolute_import
+
+import unittest
+
+from traits.api import Any, HasTraits, Unicode
+
+from ..splash_screen_log_handler import SplashScreenLogHandler
+
+
+class DummySplashScreen(HasTraits):
+    text = Unicode(u'original')
+
+class DummyRecord(object):
+    def __init__(self, message):
+        self.message = message
+
+    def getMessage(self):
+        return self.message
+
+
+class TestSplashScreenLogHandler(unittest.TestCase):
+    def setUp(self):
+        self.ss = DummySplashScreen()
+        self.sslh = SplashScreenLogHandler(self.ss)
+
+    def test_unicode_message(self):
+        self.assertEqual(self.ss.text, u'original')
+        message = u'G\u00f6khan'
+        self.sslh.emit(DummyRecord(message))
+        self.assertEqual(self.ss.text, message + u'...')
+
+    def test_ascii_message(self):
+        message = 'Goekhan'
+        self.sslh.emit(DummyRecord(message))
+        self.assertEqual(self.ss.text, message + u'...')
+