Skip to content

Commit

Permalink
Convert some more 1/0 to True/False
Browse files Browse the repository at this point in the history
  • Loading branch information
nnorwitz committed Nov 30, 2002
1 parent f4c4f11 commit 672ce57
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Lib/idlelib/TreeWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def __init__(self, canvas, parent, item):
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
Expand All @@ -90,15 +90,15 @@ def select(self, event=None):
if self.selected:
return
self.deselectall()
self.selected = 1
self.selected = True
self.canvas.delete(self.image_id)
self.drawicon()
self.drawtext()

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()
Expand Down
22 changes: 11 additions & 11 deletions Lib/idlelib/UndoDelegator.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def set_saved(self, flag):
self.saved = self.pointer
else:
self.saved = -1
self.can_merge = 0
self.can_merge = False
self.check_saved()

def get_saved(self):
Expand Down Expand Up @@ -111,7 +111,7 @@ def undo_block_stop(self):
# 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:
Expand All @@ -131,7 +131,7 @@ def addcmd(self, cmd, execute=1):
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):
Expand All @@ -141,7 +141,7 @@ def undo_event(self, event):
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"

Expand All @@ -152,7 +152,7 @@ def redo_event(self, event):
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"

Expand Down Expand Up @@ -237,19 +237,19 @@ def undo(self, text):

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 + "_"

Expand Down

0 comments on commit 672ce57

Please sign in to comment.