Merge bugfix:

Patch #520483: Make IDLE OutputWindow handle Unicode.
2.2.1 candidate.

diff --git a/Tools/idle/OutputWindow.py b/Tools/idle/OutputWindow.py
index 3d97362a21ffbee41b24d3d370105e00b4de3835..f429f2e8bfb61550b0420a9b1867a8fc8aba43be 100644 (file)
--- a/Tools/idle/OutputWindow.py
+++ b/Tools/idle/OutputWindow.py
@@ -34,7 +34,7 @@ class OutputWindow(EditorWindow):
     # Act as output file
 
     def write(self, s, tags=(), mark="insert"):
-        self.text.insert(mark, str(s), tags)
+        self.text.insert(mark, s, tags)
         self.text.see(mark)
         self.text.update()