[Python-checkins] python/dist/src/Lib/plat-mac EasyDialogs.py,1.8,1.9 PixMapWrapper.py,1.1,1.2 ic.py,1.2,1.3

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 21 Feb 2003 15:18:51 -0800


Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv5370

Modified Files:
	EasyDialogs.py PixMapWrapper.py ic.py 
Log Message:
Getting rid of macfs.


Index: EasyDialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/EasyDialogs.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EasyDialogs.py	7 Feb 2003 15:45:40 -0000	1.8
--- EasyDialogs.py	21 Feb 2003 23:18:48 -0000	1.9
***************
*** 769,773 ****
  
  def test():
! 	import time, macfs
  
  	Message("Testing EasyDialogs.")
--- 769,773 ----
  
  def test():
! 	import time
  
  	Message("Testing EasyDialogs.")
***************
*** 790,796 ****
  	else:
  		s = 'Anonymous'
! 	rv = AskFileForOpen(message="Gimme a file, %s"%s, wanted=macfs.FSSpec)
  	Message("rv: %s"%rv)
! 	rv = AskFileForSave(wanted=macfs.FSSpec, savedFileName="%s.txt"%s)
  	Message("rv.as_pathname: %s"%rv.as_pathname())
  	rv = AskFolder()
--- 790,796 ----
  	else:
  		s = 'Anonymous'
! 	rv = AskFileForOpen(message="Gimme a file, %s"%s, wanted=Carbon.File.FSSpec)
  	Message("rv: %s"%rv)
! 	rv = AskFileForSave(wanted=Carbon.File.FSRef, savedFileName="%s.txt"%s)
  	Message("rv.as_pathname: %s"%rv.as_pathname())
  	rv = AskFolder()

Index: PixMapWrapper.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/PixMapWrapper.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PixMapWrapper.py	30 Dec 2002 22:04:20 -0000	1.1
--- PixMapWrapper.py	21 Feb 2003 23:18:48 -0000	1.2
***************
*** 205,213 ****
  def test():
  	import MacOS
! 	import macfs
  	import Image
! 	fsspec, ok = macfs.PromptGetFile("Image File:")
! 	if not ok: return
! 	path = fsspec.as_pathname()
  	pm = PixMapWrapper()
  	pm.fromImage( Image.open(path) )
--- 205,212 ----
  def test():
  	import MacOS
! 	import EasyDialogs
  	import Image
! 	path = EasyDialogs.AskFileForOpen("Image File:")
! 	if not path: return
  	pm = PixMapWrapper()
  	pm.fromImage( Image.open(path) )

Index: ic.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/ic.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ic.py	5 Feb 2003 15:49:19 -0000	1.2
--- ic.py	21 Feb 2003 23:18:48 -0000	1.3
***************
*** 7,11 ****
  from Carbon import Res
  import Carbon.File
- import macfs
  import macostools
  
--- 7,10 ----