summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-02-05 15:44:03 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-02-05 15:44:03 (GMT)
commitd66071b48dbcfaeabe498babcad2b5f4e1c17c4b (patch)
tree0edcc3bccd2563d5bff471dc8307bf4abc0fb16e /Lib
parent611b9f669777a18736bf1bafa03f4e965d8640a2 (diff)
downloadcpython-d66071b48dbcfaeabe498babcad2b5f4e1c17c4b.zip
cpython-d66071b48dbcfaeabe498babcad2b5f4e1c17c4b.tar.gz
cpython-d66071b48dbcfaeabe498babcad2b5f4e1c17c4b.tar.bz2
Got rid of macfs
Diffstat (limited to 'Lib')
-rw-r--r--Lib/plat-mac/cfmfile.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/plat-mac/cfmfile.py b/Lib/plat-mac/cfmfile.py
index 63d7233..a4eecf2 100644
--- a/Lib/plat-mac/cfmfile.py
+++ b/Lib/plat-mac/cfmfile.py
@@ -5,7 +5,7 @@
__version__ = "0.8b3"
__author__ = "jvr"
-import macfs
+import Carbon.File
import struct
from Carbon import Res
import os
@@ -28,10 +28,8 @@ def mergecfmfiles(srclist, dst, architecture = 'fat'):
srclist = list(srclist)
for i in range(len(srclist)):
- if type(srclist[i]) == macfs.FSSpecType:
- srclist[i] = srclist[i].as_pathname()
- if type(dst) == macfs.FSSpecType:
- dst = dst.as_pathname()
+ srclist[i] = Carbon.File.pathname(srclist[i])
+ dst = Carbon.File.pathname(dst)
dstfile = open(dst, "wb")
rf = Res.FSpOpenResFile(dst, 3)