[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE PyDocSearch.py,1.8,1.8.6.1

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory usw-pr-cvs1:/tmp/cvs-serv25745

Modified Files:
      Tag: release22-maint
	PyDocSearch.py 
Log Message:
Backport of 1.9:
Changes by Donovan Preston (and a few minor ones by me) to make IDE run under
MachoPython. Mainly making sure we don't call routines that don't exist
and representing pathnames in a os.separator-neutral format.

These shouldn't interfere too much with Just's work on the next generation IDE,
I hope.



Index: PyDocSearch.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyDocSearch.py,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -C2 -d -r1.8 -r1.8.6.1
*** PyDocSearch.py	3 Dec 2001 19:27:38 -0000	1.8
--- PyDocSearch.py	24 Feb 2002 23:16:25 -0000	1.8.6.1
***************
*** 123,127 ****
  	hits = {}
  	try:
! 		MacOS.EnableAppswitch(0)
  		try:
  			for do, name in books:
--- 123,128 ----
  	hits = {}
  	try:
! 		if hasattr(MacOS, 'EnableAppswitch'):
! 			MacOS.EnableAppswitch(0)
  		try:
  			for do, name in books:
***************
*** 146,150 ****
  						hits[fullpath] = filehits
  		finally:
! 			MacOS.EnableAppswitch(-1)
  			status.close()
  	except KeyboardInterrupt:
--- 147,152 ----
  						hits[fullpath] = filehits
  		finally:
! 			if hasattr(MacOS, 'EnableAppswitch'):
! 				MacOS.EnableAppswitch(-1)
  			status.close()
  	except KeyboardInterrupt: