Convert some more 1/0 to True/False

diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/TreeWidget.py
index d7132648ac2df6127d19761b6c2164cd57b0cb60..7ad4002c69f0d443c04aeae7732163058032288e 100644 (file)
--- a/Lib/idlelib/TreeWidget.py
+++ b/Lib/idlelib/TreeWidget.py
@@ -63,7 +63,7 @@ class TreeNode:
         self.parent = parent
         self.item = item
         self.state = 'collapsed'
-        self.selected = 0
+        self.selected = False
         self.children = []
         self.x = self.y = None
         self.iconimages = {} # cache of PhotoImage instances for icons
@@ -90,7 +90,7 @@ class TreeNode:
         if self.selected:
             return
         self.deselectall()
-        self.selected = 1
+        self.selected = True
         self.canvas.delete(self.image_id)
         self.drawicon()
         self.drawtext()
@@ -98,7 +98,7 @@ class TreeNode:
     def deselect(self, event=None):
         if not self.selected:
             return
-        self.selected = 0
+        self.selected = False
         self.canvas.delete(self.image_id)
         self.drawicon()
         self.drawtext()

diff --git a/Lib/idlelib/UndoDelegator.py b/Lib/idlelib/UndoDelegator.py
index 54b08510814691161acddf6dcc11b8208adf6df1..2452a98a5cc36706be0ebed89389e02d46721133 100644 (file)
--- a/Lib/idlelib/UndoDelegator.py
+++ b/Lib/idlelib/UndoDelegator.py
@@ -57,7 +57,7 @@ class UndoDelegator(Delegator):
             self.saved = self.pointer
         else:
             self.saved = -1
-        self.can_merge = 0
+        self.can_merge = False
         self.check_saved()
 
     def get_saved(self):
@@ -111,7 +111,7 @@ class UndoDelegator(Delegator):
                 # been done, so don't execute it again
                 self.addcmd(cmd, 0)
 
-    def addcmd(self, cmd, execute=1):
+    def addcmd(self, cmd, execute=True):
         if execute:
             cmd.do(self.delegate)
         if self.undoblock != 0:
@@ -131,7 +131,7 @@ class UndoDelegator(Delegator):
             self.pointer = self.pointer - 1
             if self.saved >= 0:
                 self.saved = self.saved - 1
-        self.can_merge = 1
+        self.can_merge = True
         self.check_saved()
 
     def undo_event(self, event):
@@ -141,7 +141,7 @@ class UndoDelegator(Delegator):
         cmd = self.undolist[self.pointer - 1]
         cmd.undo(self.delegate)
         self.pointer = self.pointer - 1
-        self.can_merge = 0
+        self.can_merge = False
         self.check_saved()
         return "break"
 
@@ -152,7 +152,7 @@ class UndoDelegator(Delegator):
         cmd = self.undolist[self.pointer]
         cmd.redo(self.delegate)
         self.pointer = self.pointer + 1
-        self.can_merge = 0
+        self.can_merge = False
         self.check_saved()
         return "break"
 
@@ -237,19 +237,19 @@ class InsertCommand(Command):
 
     def merge(self, cmd):
         if self.__class__ is not cmd.__class__:
-            return 0
+            return False
         if self.index2 != cmd.index1:
-            return 0
+            return False
         if self.tags != cmd.tags:
-            return 0
+            return False
         if len(cmd.chars) != 1:
-            return 0
+            return False
         if self.chars and \
            self.classify(self.chars[-1]) != self.classify(cmd.chars):
-            return 0
+            return False
         self.index2 = cmd.index2
         self.chars = self.chars + cmd.chars
-        return 1
+        return True
 
     alphanumeric = string.ascii_letters + string.digits + "_"