[Python-checkins] python/dist/src/Lib tempfile.py,1.54,1.55

2003年3月21日 04:55:13 -0800

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv7914
Modified Files:
	tempfile.py 
Log Message:
Getting rid of macfs.
Index: tempfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/tempfile.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** tempfile.py	30 Dec 2002 22:36:09 -0000	1.54
--- tempfile.py	21 Mar 2003 12:55:10 -0000	1.55
***************
*** 34,39 ****

 if _os.name == 'mac':
! import macfs as _macfs
! import MACFS as _MACFS

 try:
--- 34,39 ----

 if _os.name == 'mac':
! import Carbon.Folder as _Folder
! import Carbon.Folders as _Folders

 try:
***************
*** 125,133 ****
 if _os.name == 'mac':
 try:
! refnum, dirid = _macfs.FindFolder(_MACFS.kOnSystemDisk,
! _MACFS.kTemporaryFolderType, 1)
! dirname = _macfs.FSSpec((refnum, dirid, '')).as_pathname()
 dirlist.append(dirname)
! except _macfs.error:
 pass
 elif _os.name == 'riscos':
--- 125,133 ----
 if _os.name == 'mac':
 try:
! fsr = _Folder.FSFindFolder(_Folders.kOnSystemDisk,
! _Folders.kTemporaryFolderType, 1)
! dirname = fsr.as_pathname()
 dirlist.append(dirname)
! except _Folder.error:
 pass
 elif _os.name == 'riscos':