Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix Mac build, patch #1091 by Humberto Diogenes.

This commit is contained in:
Georg Brandl 2007-09-03 07:27:49 +00:00
parent e4ac7504c9
commit c76473d887
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/plat-mac/Carbon/ControlAccessor.py
View File

@ -1,6 +1,6 @@
# Accessor functions for control properties
from Controls import *
from Carbon.Controls import *
import struct
# These needn't go through this module, but are here for completeness

3
Lib/plat-mac/buildtools.py
View File

@ -17,7 +17,8 @@ import warnings
warnings.warn("the buildtools module is deprecated", DeprecationWarning, 2)
BuildError = "BuildError"
class BuildError(Exception):
pass
# .pyc file (and 'PYC ' resource magic number)
MAGIC = imp.get_magic()

2
Lib/plat-mac/bundlebuilder.py
View File

@ -180,7 +180,7 @@ class BundleBuilder(Defaults):
assert len(self.type) == len(self.creator) == 4, \
"type and creator must be 4-byte strings."
pkginfo = pathjoin(contents, "PkgInfo")
f = open(pkginfo, "wb")
f = open(pkginfo, "w")
f.write(self.type + self.creator)
f.close()
#

16
Lib/plat-mac/macresource.py
View File

@ -76,15 +76,15 @@ def open_pathname(pathname, verbose=0):
AppleSingle file"""
try:
refno = Res.FSpOpenResFile(pathname, 1)
except Res.Error as arg:
if arg[0] in (-37, -39):
except Res.Error as error:
if error.args[0] in (-37, -39):
# No resource fork. We may be on OSX, and this may be either
# a data-fork based resource file or a AppleSingle file
# from the CVS repository.
try:
refno = Res.FSOpenResourceFile(pathname, '', 1)
except Res.Error as arg:
if arg[0] != -199:
except Res.Error as error:
if error.args[0] != -199:
# -199 is "bad resource map"
raise
else:
@ -103,15 +103,15 @@ def resource_pathname(pathname, verbose=0):
try:
refno = Res.FSpOpenResFile(pathname, 1)
Res.CloseResFile(refno)
except Res.Error as arg:
if arg[0] in (-37, -39):
except Res.Error as error:
if error.args[0] in (-37, -39):
# No resource fork. We may be on OSX, and this may be either
# a data-fork based resource file or a AppleSingle file
# from the CVS repository.
try:
refno = Res.FSOpenResourceFile(pathname, '', 1)
except Res.Error as arg:
if arg[0] != -199:
except Res.Error as error:
if error.args[0] != -199:
# -199 is "bad resource map"
raise
else:

2
Mac/IDLE/Makefile.in
View File

@ -55,5 +55,5 @@ IDLE.app: \
Info.plist: $(srcdir)/Info.plist.in
sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(srcdir)/Info.plist.in > Info.plist
sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(srcdir)/Info.plist.in > Info.plist

2
Mac/PythonLauncher/Makefile.in
View File

@ -78,4 +78,4 @@ Python\ Launcher: $(OBJECTS)
$(CC) $(LDFLAGS) -o "Python Launcher" $(OBJECTS) -framework AppKit -framework Carbon
Info.plist: $(srcdir)/Info.plist.in
sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(srcdir)/Info.plist.in > Info.plist
sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(srcdir)/Info.plist.in > Info.plist

4
Mac/Tools/fixapplepython23.py
View File

@ -80,11 +80,11 @@ def makescript(filename, compiler):
"""Create a wrapper script for a compiler"""
dirname = os.path.split(filename)[0]
if not os.access(dirname, os.X_OK):
os.mkdir(dirname, 0755)
os.mkdir(dirname, 0o755)
fp = open(filename, 'w')
fp.write(SCRIPT % compiler)
fp.close()
os.chmod(filename, 0755)
os.chmod(filename, 0o755)
print('fixapplepython23: Created', filename)
def main():

3
Mac/scripts/cachersrc.py
View File

@ -12,7 +12,8 @@ import getopt
class NoArgsError(Exception):
pass
def handler((verbose, force), dirname, fnames):
def handler(arg1, dirname, fnames):
verbose, force = arg1
for fn in fnames:
if fn[-5:] == '.rsrc' and fn[-13:] != '.rsrc.df.rsrc':
if force: