From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 5 Feb 2003 15:44:03 +0000 (+0000)
Subject: Got rid of macfs
X-Git-Tag: v2.3c1~2024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d66071b48dbcfaeabe498babcad2b5f4e1c17c4b;p=thirdparty%2FPython%2Fcpython.git

Got rid of macfs
---

diff --git a/Lib/plat-mac/cfmfile.py b/Lib/plat-mac/cfmfile.py
index 63d7233cae0b..a4eecf23be83 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)