Run 2to3's print fixer over some places that had been missed.

This commit is contained in:
Collin Winter 2007-08-30 18:39:28 +00:00
parent 716c3ac40c
commit e7bf59f500
51 changed files with 253 additions and 253 deletions

View file

@ -57,23 +57,23 @@ def fix(makefile, do_apply):
continue
i = findline(lines, old)
if i < 0:
print 'fixapplepython23: Python installation not fixed (appears broken)'
print 'fixapplepython23: missing line:', old
print('fixapplepython23: Python installation not fixed (appears broken)')
print('fixapplepython23: missing line:', old)
return 2
lines[i] = new
fixed = True
if fixed:
if do_apply:
print 'fixapplepython23: Fix to Apple-installed Python 2.3 applied'
print('fixapplepython23: Fix to Apple-installed Python 2.3 applied')
os.rename(makefile, makefile + '~')
open(makefile, 'w').writelines(lines)
return 0
else:
print 'fixapplepython23: Fix to Apple-installed Python 2.3 should be applied'
print('fixapplepython23: Fix to Apple-installed Python 2.3 should be applied')
return 1
else:
print 'fixapplepython23: No fix needed, appears to have been applied before'
print('fixapplepython23: No fix needed, appears to have been applied before')
return 0
def makescript(filename, compiler):
@ -85,7 +85,7 @@ def makescript(filename, compiler):
fp.write(SCRIPT % compiler)
fp.close()
os.chmod(filename, 0755)
print 'fixapplepython23: Created', filename
print('fixapplepython23: Created', filename)
def main():
# Check for -n option
@ -96,24 +96,24 @@ def main():
# First check OS version
if sys.byteorder == 'little':
# All intel macs are fine
print "fixapplypython23: no fix is needed on MacOSX on Intel"
print("fixapplypython23: no fix is needed on MacOSX on Intel")
sys.exit(0)
if gestalt.gestalt('sysv') < 0x1030:
print 'fixapplepython23: no fix needed on MacOSX < 10.3'
print('fixapplepython23: no fix needed on MacOSX < 10.3')
sys.exit(0)
if gestalt.gestalt('sysv') >= 0x1040:
print 'fixapplepython23: no fix needed on MacOSX >= 10.4'
print('fixapplepython23: no fix needed on MacOSX >= 10.4')
sys.exit(0)
# Test that a framework Python is indeed installed
if not os.path.exists(MAKEFILE):
print 'fixapplepython23: Python framework does not appear to be installed (?), nothing fixed'
print('fixapplepython23: Python framework does not appear to be installed (?), nothing fixed')
sys.exit(0)
# Check that we can actually write the file
if do_apply and not os.access(MAKEFILE, os.W_OK):
print 'fixapplepython23: No write permission, please run with "sudo"'
print('fixapplepython23: No write permission, please run with "sudo"')
sys.exit(2)
# Create the shell scripts
if do_apply: