[Idle-dev] CVS: idle IOBinding.py,1.15,1.16

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv3134

Modified Files:
	IOBinding.py 
Log Message:
Whitespace Normalization


Index: IOBinding.py
===================================================================
RCS file: /cvsroot/idlefork/idle/IOBinding.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** IOBinding.py	10 May 2003 00:49:56 -0000	1.15
--- IOBinding.py	18 May 2003 02:24:32 -0000	1.16
***************
*** 74,78 ****
      def __init__(self, master, enc):
          self.should_edit = False
!         
          self.root = top = Toplevel(master)
          top.bind("<Return>", self.return_event)
--- 74,78 ----
      def __init__(self, master, enc):
          self.should_edit = False
! 
          self.root = top = Toplevel(master)
          top.bind("<Return>", self.return_event)
***************
*** 107,111 ****
                      command=self.do_edit)
          b2.pack(side=LEFT, fill=BOTH, expand=1)
!         
          self._set_transient(master)
  
--- 107,111 ----
                      command=self.do_edit)
          b2.pack(side=LEFT, fill=BOTH, expand=1)
! 
          self._set_transient(master)
  
***************
*** 417,449 ****
          # Nothing was declared, and we had not determined an encoding
          # on loading. Recommend an encoding line.
! 	config_encoding = idleConf.GetOption("main","EditorWindow",
! 					     "encoding")
! 	if config_encoding == 'utf-8':
! 		# User has requested that we save files as UTF-8
! 		return BOM_UTF8 + chars.encode("utf-8")
! 	ask_user = True
! 	try:
! 	    chars = chars.encode(encoding)
! 	    enc = encoding
! 	    if config_encoding == 'locale':
                  ask_user = False
! 	except UnicodeError:
! 	    chars = BOM_UTF8 + chars.encode("utf-8")
! 	    enc = "utf-8"
! 	if not ask_user:
              return chars
! 	dialog = EncodingMessage(self.editwin.top, enc)
! 	dialog.go()
! 	if dialog.num == 1:
! 	    # User asked us to edit the file
! 	    encline = "# -*- coding: %s -*-\n" % enc
! 	    firstline = self.text.get("1.0", "2.0")
! 	    if firstline.startswith("#!"):
! 		# Insert encoding after #! line
! 		self.text.insert("2.0", encline)
! 	    else:
! 		self.text.insert("1.0", encline)
! 	    return self.encode(self.text.get("1.0", "end-1c"))
! 	return chars
  
      def fixlastline(self):
--- 417,449 ----
          # Nothing was declared, and we had not determined an encoding
          # on loading. Recommend an encoding line.
!         config_encoding = idleConf.GetOption("main","EditorWindow",
!                                              "encoding")
!         if config_encoding == 'utf-8':
!             # User has requested that we save files as UTF-8
!             return BOM_UTF8 + chars.encode("utf-8")
!         ask_user = True
!         try:
!             chars = chars.encode(encoding)
!             enc = encoding
!             if config_encoding == 'locale':
                  ask_user = False
!         except UnicodeError:
!             chars = BOM_UTF8 + chars.encode("utf-8")
!             enc = "utf-8"
!         if not ask_user:
              return chars
!         dialog = EncodingMessage(self.editwin.top, enc)
!         dialog.go()
!         if dialog.num == 1:
!             # User asked us to edit the file
!             encline = "# -*- coding: %s -*-\n" % enc
!             firstline = self.text.get("1.0", "2.0")
!             if firstline.startswith("#!"):
!                 # Insert encoding after #! line
!                 self.text.insert("2.0", encline)
!             else:
!                 self.text.insert("1.0", encline)
!             return self.encode(self.text.get("1.0", "end-1c"))
!         return chars
  
      def fixlastline(self):