[Idle-dev] CVS: idle ReplaceDialog.py,1.4,1.5

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv25902

Modified Files:
	ReplaceDialog.py 
Log Message:
Merge Py Idle changes:

Rev 1.5 tim_one
Convert a pile of obvious "yes/no" functions to return bool

Rev 1.6 GvR
Rev 1.7 Gvr
(Already merged Idlefork ReplaceDialog.py 1.3.2.1 and 1.4)

Rev 1.8 doerwalter
(string methods)

Rev 1.9 nnorwitz
Remove unnecessary imports


Index: ReplaceDialog.py
===================================================================
RCS file: /cvsroot/idlefork/idle/ReplaceDialog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ReplaceDialog.py	14 Sep 2002 02:53:05 -0000	1.4
--- ReplaceDialog.py	18 Sep 2002 02:56:10 -0000	1.5
***************
*** 1,8 ****
- import string
- import os
- import re
- import fnmatch
  from Tkinter import *
- import tkMessageBox
  import SearchEngine
  from SearchDialogBase import SearchDialogBase
--- 1,3 ----
***************
*** 112,121 ****
      def do_find(self, ok=0):
          if not self.engine.getprog():
!             return 0
          text = self.text
          res = self.engine.search_text(text, None, ok)
          if not res:
              text.bell()
!             return 0
          line, m = res
          i, j = m.span()
--- 107,116 ----
      def do_find(self, ok=0):
          if not self.engine.getprog():
!             return False
          text = self.text
          res = self.engine.search_text(text, None, ok)
          if not res:
              text.bell()
!             return False
          line, m = res
          i, j = m.span()
***************
*** 124,133 ****
          self.show_hit(first, last)
          self.ok = 1
!         return 1
  
      def do_replace(self):
          prog = self.engine.getprog()
          if not prog:
!             return 0
          text = self.text
          try:
--- 119,128 ----
          self.show_hit(first, last)
          self.ok = 1
!         return True
  
      def do_replace(self):
          prog = self.engine.getprog()
          if not prog:
!             return False
          text = self.text
          try:
***************
*** 142,146 ****
          m = prog.match(chars, col)
          if not prog:
!             return 0
          new = m.expand(self.replvar.get())
          text.mark_set("insert", first)
--- 137,141 ----
          m = prog.match(chars, col)
          if not prog:
!             return False
          new = m.expand(self.replvar.get())
          text.mark_set("insert", first)
***************
*** 153,157 ****
          self.show_hit(first, text.index("insert"))
          self.ok = 0
!         return 1
  
      def show_hit(self, first, last):
--- 148,152 ----
          self.show_hit(first, text.index("insert"))
          self.ok = 0
!         return True
  
      def show_hit(self, first, last):