Merge from 2.3: Fix for issue #2452

spyder-ide · Jun 4, 2015 · df0b2ec · df0b2ec
2 parents 641b927 + 50bfb46
commit df0b2ec
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/spyderlib/widgets/shell.py b/spyderlib/widgets/shell.py
@@ -11,12 +11,13 @@
 # pylint: disable=R0911
 # pylint: disable=R0201
 
+import keyword
+import locale
 import os
-import time
 import os.path as osp
 import re
 import sys
-import keyword
+import time
 
 from spyderlib.qt.QtGui import (QMenu, QApplication, QToolTip, QKeySequence,
                                 QMessageBox, QTextCursor, QTextCharFormat)
@@ -37,7 +38,7 @@
                                       SaveHistoryMixin)
 from spyderlib.widgets.arraybuilder import (SHORTCUT_INLINE, SHORTCUT_TABLE)
 from spyderlib.py3compat import (is_text_string, to_text_string, builtins,
-                                 is_string)
+                                 is_string, PY3)
 
 
 class ShellBaseWidget(ConsoleBaseWidget, SaveHistoryMixin):
@@ -592,7 +593,19 @@ def write(self, text, flush=False, error=False, prompt=False):
 
     def flush(self, error=False, prompt=False):
         """Flush buffer, write text to console"""
-        text = "".join(self.__buffer)
+        # Fix for Issue 2452 
+        if PY3:
+            try:
+                text = "".join(self.__buffer)
+            except TypeError:
+                text = b"".join(self.__buffer)
+                try:
+                    text = text.decode( locale.getdefaultlocale()[1] )
+                except:
+                    pass
+        else:
+            text = "".join(self.__buffer)
+
         self.__buffer = []
         self.insert_text(text, at_end=True, error=error, prompt=prompt)
         QCoreApplication.processEvents()