Commit d66071b4 authored by Jack Jansen's avatar Jack Jansen

Got rid of macfs

parent 611b9f66
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
__version__ = "0.8b3" __version__ = "0.8b3"
__author__ = "jvr" __author__ = "jvr"
import macfs import Carbon.File
import struct import struct
from Carbon import Res from Carbon import Res
import os import os
...@@ -28,10 +28,8 @@ def mergecfmfiles(srclist, dst, architecture = 'fat'): ...@@ -28,10 +28,8 @@ def mergecfmfiles(srclist, dst, architecture = 'fat'):
srclist = list(srclist) srclist = list(srclist)
for i in range(len(srclist)): for i in range(len(srclist)):
if type(srclist[i]) == macfs.FSSpecType: srclist[i] = Carbon.File.pathname(srclist[i])
srclist[i] = srclist[i].as_pathname() dst = Carbon.File.pathname(dst)
if type(dst) == macfs.FSSpecType:
dst = dst.as_pathname()
dstfile = open(dst, "wb") dstfile = open(dst, "wb")
rf = Res.FSpOpenResFile(dst, 3) rf = Res.FSpOpenResFile(dst, 3)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment