[Python-checkins] CVS: python/dist/src/Mac/Lib EasyDialogs.py,1.32,1.32.2.1 findertools.py,1.6,1.6.2.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Mac/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv14630/descr/dist/src/Mac/Lib

Modified Files:
      Tag: descr-branch
	EasyDialogs.py findertools.py 
Log Message:
Merge of trunk tags date2001-07-21 to date2001-07-28.


Index: EasyDialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/EasyDialogs.py,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** EasyDialogs.py	2001/06/26 06:57:12	1.32
--- EasyDialogs.py	2001/07/28 05:02:59	1.32.2.1
***************
*** 278,282 ****
  			else:
  				if part == 4:	# inDrag 
! 					self.d.DragWindow(where, screenbounds)
  				else:
  					MacOS.HandleEvent(ev) 
--- 278,282 ----
  			else:
  				if part == 4:	# inDrag 
! 					self.w.DragWindow(where, screenbounds)
  				else:
  					MacOS.HandleEvent(ev) 

Index: findertools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/findertools.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** findertools.py	2001/05/17 12:44:31	1.6
--- findertools.py	2001/07/28 05:02:59	1.6.2.1
***************
*** 682,686 ****
  	fss = macfs.FSSpec(path)
  	trashfolder = macfs.FSSpec(macfs.FindFolder(fss.as_tuple()[0], 'trsh', 0) + ("",)).as_pathname()
! 	findertools.move(path, trashfolder)
  
  def emptytrash():
--- 682,686 ----
  	fss = macfs.FSSpec(path)
  	trashfolder = macfs.FSSpec(macfs.FindFolder(fss.as_tuple()[0], 'trsh', 0) + ("",)).as_pathname()
! 	move(path, trashfolder)
  
  def emptytrash():