[Idle-dev] CVS: idle TreeWidget.py,1.4,1.5 UndoDelegator.py,1.3,1.4

[Neal Norwitz]

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

Modified Files:
	TreeWidget.py UndoDelegator.py 
Log Message:
Convert some more 1/0 to True/False

Index: TreeWidget.py
===================================================================
RCS file: /cvsroot/idlefork/idle/TreeWidget.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TreeWidget.py	18 Sep 2002 03:26:47 -0000	1.4
--- TreeWidget.py	30 Nov 2002 19:04:06 -0000	1.5
***************
*** 64,68 ****
          self.item = item
          self.state = 'collapsed'
!         self.selected = 0
          self.children = []
          self.x = self.y = None
--- 64,68 ----
          self.item = item
          self.state = 'collapsed'
!         self.selected = False
          self.children = []
          self.x = self.y = None
***************
*** 91,95 ****
              return
          self.deselectall()
!         self.selected = 1
          self.canvas.delete(self.image_id)
          self.drawicon()
--- 91,95 ----
              return
          self.deselectall()
!         self.selected = True
          self.canvas.delete(self.image_id)
          self.drawicon()
***************
*** 99,103 ****
          if not self.selected:
              return
!         self.selected = 0
          self.canvas.delete(self.image_id)
          self.drawicon()
--- 99,103 ----
          if not self.selected:
              return
!         self.selected = False
          self.canvas.delete(self.image_id)
          self.drawicon()

Index: UndoDelegator.py
===================================================================
RCS file: /cvsroot/idlefork/idle/UndoDelegator.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UndoDelegator.py	18 Sep 2002 03:30:12 -0000	1.3
--- UndoDelegator.py	30 Nov 2002 19:04:07 -0000	1.4
***************
*** 58,62 ****
          else:
              self.saved = -1
!         self.can_merge = 0
          self.check_saved()
  
--- 58,62 ----
          else:
              self.saved = -1
!         self.can_merge = False
          self.check_saved()
  
***************
*** 112,116 ****
                  self.addcmd(cmd, 0)
  
!     def addcmd(self, cmd, execute=1):
          if execute:
              cmd.do(self.delegate)
--- 112,116 ----
                  self.addcmd(cmd, 0)
  
!     def addcmd(self, cmd, execute=True):
          if execute:
              cmd.do(self.delegate)
***************
*** 132,136 ****
              if self.saved >= 0:
                  self.saved = self.saved - 1
!         self.can_merge = 1
          self.check_saved()
  
--- 132,136 ----
              if self.saved >= 0:
                  self.saved = self.saved - 1
!         self.can_merge = True
          self.check_saved()
  
***************
*** 142,146 ****
          cmd.undo(self.delegate)
          self.pointer = self.pointer - 1
!         self.can_merge = 0
          self.check_saved()
          return "break"
--- 142,146 ----
          cmd.undo(self.delegate)
          self.pointer = self.pointer - 1
!         self.can_merge = False
          self.check_saved()
          return "break"
***************
*** 153,157 ****
          cmd.redo(self.delegate)
          self.pointer = self.pointer + 1
!         self.can_merge = 0
          self.check_saved()
          return "break"
--- 153,157 ----
          cmd.redo(self.delegate)
          self.pointer = self.pointer + 1
!         self.can_merge = False
          self.check_saved()
          return "break"
***************
*** 238,254 ****
      def merge(self, cmd):
          if self.__class__ is not cmd.__class__:
!             return 0
          if self.index2 != cmd.index1:
!             return 0
          if self.tags != cmd.tags:
!             return 0
          if len(cmd.chars) != 1:
!             return 0
          if self.chars and \
             self.classify(self.chars[-1]) != self.classify(cmd.chars):
!             return 0
          self.index2 = cmd.index2
          self.chars = self.chars + cmd.chars
!         return 1
  
      alphanumeric = string.ascii_letters + string.digits + "_"
--- 238,254 ----
      def merge(self, cmd):
          if self.__class__ is not cmd.__class__:
!             return False
          if self.index2 != cmd.index1:
!             return False
          if self.tags != cmd.tags:
!             return False
          if len(cmd.chars) != 1:
!             return False
          if self.chars and \
             self.classify(self.chars[-1]) != self.classify(cmd.chars):
!             return False
          self.index2 = cmd.index2
          self.chars = self.chars + cmd.chars
!         return True
  
      alphanumeric = string.ascii_letters + string.digits + "_"