[Python-checkins] python/dist/src/Tools/idle OutputWindow.py,1.5.22.2,1.5.22.3

gvanrossum@users.sourceforge.net gvanrossum@users.sourceforge.net
Tue, 24 Sep 2002 10:52:07 -0700


Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv20244

Modified Files:
      Tag: release22-maint
	OutputWindow.py 
Log Message:
Revert Raymond H's checkin.  That change depends on a new feature in
2.3, support for source code encodings, so it shouldn't be backported
(no matter how attractive the checkin msg sounded).

Please, try to *use* IDLE before committing changes!


Index: OutputWindow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/OutputWindow.py,v
retrieving revision 1.5.22.2
retrieving revision 1.5.22.3
diff -C2 -d -r1.5.22.2 -r1.5.22.3
*** OutputWindow.py	23 Sep 2002 14:30:24 -0000	1.5.22.2
--- OutputWindow.py	24 Sep 2002 17:52:05 -0000	1.5.22.3
***************
*** 3,7 ****
  import re
  import tkMessageBox
- import IOBinding
  
  class OutputWindow(EditorWindow):
--- 3,6 ----
***************
*** 36,47 ****
  
      def write(self, s, tags=(), mark="insert"):
-         # Tk assumes that byte strings are Latin-1;
-         # we assume that they are in the locale's encoding
-         if isinstance(s, str):
-             try:
-                 s = unicode(s, IOBinding.encoding)
-             except UnicodeError:
-                 # some other encoding; let Tcl deal with it
-                 pass
          self.text.insert(mark, s, tags)
          self.text.see(mark)
--- 35,38 ----