Replaced OpenResFile calls with FSpOpenResFile calls (which are carbon-compatible).
diff --git a/Mac/Tools/CGI/BuildCGIApplet.py b/Mac/Tools/CGI/BuildCGIApplet.py
index 8c9a633..c94eca9 100644
--- a/Mac/Tools/CGI/BuildCGIApplet.py
+++ b/Mac/Tools/CGI/BuildCGIApplet.py
@@ -64,7 +64,7 @@
def buildone(template, wrapper, src, dst):
buildtools.process(template, wrapper, dst, 1)
# write source as a PYC resource into dst
- ref = Res.OpenResFile(dst)
+ ref = Res.FSpOpenResFile(dst, 1)
try:
Res.UseResFile(ref)
py_resource.frompyfile(src, "CGI_MAIN", preload=1)
diff --git a/Mac/Tools/IDE/BuildIDE.py b/Mac/Tools/IDE/BuildIDE.py
index 82a0636..942670a 100644
--- a/Mac/Tools/IDE/BuildIDE.py
+++ b/Mac/Tools/IDE/BuildIDE.py
@@ -19,7 +19,7 @@
buildtools.process(template, mainfilename, dstfilename, 1)
-targetref = Res.OpenResFile(dstfilename)
+targetref = Res.FSpOpenResFile(dstfilename, 3)
Res.UseResFile(targetref)
files = os.listdir(ide_home)
@@ -36,6 +36,6 @@
ispackage=0)
# add W resources
-wresref = Res.OpenResFile(os.path.join(ide_home, "Widgets.rsrc"))
+wresref = Res.FSpOpenResFile(os.path.join(ide_home, "Widgets.rsrc"), 1)
buildtools.copyres(wresref, targetref, [], 0)
diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py
index bff5baf..0a0773e 100644
--- a/Mac/Tools/IDE/PyEdit.py
+++ b/Mac/Tools/IDE/PyEdit.py
@@ -114,7 +114,7 @@
def readwindowsettings(self):
try:
- resref = Res.OpenResFile(self.path)
+ resref = Res.FSpOpenResFile(self.path, 1)
except Res.Error:
return
try:
@@ -127,10 +127,10 @@
def writewindowsettings(self):
try:
- resref = Res.OpenResFile(self.path)
+ resref = Res.FSpOpenResFile(self.path, 3)
except Res.Error:
Res.CreateResFile(self.path)
- resref = Res.OpenResFile(self.path)
+ resref = Res.FSpOpenResFile(self.path, 3)
try:
data = Res.Resource(marshal.dumps(self.settings))
Res.UseResFile(resref)
diff --git a/Mac/Tools/macfreeze/macfreezegui.py b/Mac/Tools/macfreeze/macfreezegui.py
index bd70c00..c3311b7 100644
--- a/Mac/Tools/macfreeze/macfreezegui.py
+++ b/Mac/Tools/macfreeze/macfreezegui.py
@@ -60,7 +60,7 @@
d = None
if d == None:
try:
- Res.OpenResFile('macfreeze.rsrc')
+ Res.FSpOpenResFile('macfreeze.rsrc', 1)
except Res.Error:
d = None
else:
diff --git a/Mac/Tools/macfreeze/macgen_bin.py b/Mac/Tools/macfreeze/macgen_bin.py
index 04260ed..9b653cb 100644
--- a/Mac/Tools/macfreeze/macgen_bin.py
+++ b/Mac/Tools/macfreeze/macgen_bin.py
@@ -39,7 +39,7 @@
print 'Adding "__main__"'
buildtools.process(applettemplatepath, input, output, 0)
- outputref = Res.OpenResFile(output)
+ outputref = Res.FSpOpenResFile(output, 3)
try:
Res.UseResFile(outputref)
@@ -171,10 +171,10 @@
def copyres(input, output, *args, **kwargs):
openedin = openedout = 0
if type(input) == types.StringType:
- input = Res.OpenResFile(input)
+ input = Res.FSpOpenResFile(input, 1)
openedin = 1
if type(output) == types.StringType:
- output = Res.OpenResFile(output)
+ output = Res.FSpOpenResFile(output, 3)
openedout = 1
try:
apply(buildtools.copyres, (input, output) + args, kwargs)
diff --git a/Mac/Tools/twit/mactwit_app.py b/Mac/Tools/twit/mactwit_app.py
index 4b8433a..8c568df 100644
--- a/Mac/Tools/twit/mactwit_app.py
+++ b/Mac/Tools/twit/mactwit_app.py
@@ -260,7 +260,7 @@
dummy = Res.GetResource('DLOG', ID_MODULES)
except Res.Error:
try:
- Res.OpenResFile("Twit.rsrc")
+ Res.FSpOpenResFile("Twit.rsrc", 1)
except Res.Error, arg:
EasyDialogs.Message("Cannot open Twit.rsrc: "+arg[1])
sys.exit(1)
diff --git a/Mac/Tools/twit/mactwit_browser.py b/Mac/Tools/twit/mactwit_browser.py
index a8968ca..070de43 100644
--- a/Mac/Tools/twit/mactwit_browser.py
+++ b/Mac/Tools/twit/mactwit_browser.py
@@ -61,7 +61,7 @@
ourparentdir = os.path.split(openresfile.func_code.co_filename)[0]
os.chdir(ourparentdir)
try:
- Res.OpenResFile("mactwit_browse.rsrc")
+ Res.FSpOpenResFile("mactwit_browse.rsrc", 1)
except Res.Error, arg:
EasyDialogs.Message("Cannot open mactwit_browse.rsrc: "+arg[1])
sys.exit(1)