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

@@ -336,16 +336,16 @@ def parseOptions(args=None):
options, args = getopt.getopt(args, '?hb',
[ 'build-dir=', 'third-party=', 'sdk-path=' , 'src-dir='])
except getopt.error as msg:
print msg
print(msg)
sys.exit(1)
if args:
print "Additional arguments"
print("Additional arguments")
sys.exit(1)
for k, v in options:
if k in ('-h', '-?'):
print USAGE
print(USAGE)
sys.exit(0)
elif k in ('-d', '--build-dir'):
@@ -368,12 +368,12 @@ def parseOptions(args=None):
SDKPATH=os.path.abspath(SDKPATH)
DEPSRC=os.path.abspath(DEPSRC)
print "Settings:"
print " * Source directory:", SRCDIR
print " * Build directory: ", WORKDIR
print " * SDK location: ", SDKPATH
print " * third-party source:", DEPSRC
print ""
print("Settings:")
print(" * Source directory:", SRCDIR)
print(" * Build directory: ", WORKDIR)
print(" * SDK location: ", SDKPATH)
print(" * third-party source:", DEPSRC)
print("")
@@ -440,7 +440,7 @@ def downloadURL(url, fname):
pass
else:
if KNOWNSIZES.get(url) == size:
print "Using existing file for", url
print("Using existing file for", url)
return
fpIn = urllib2.urlopen(url)
fpOut = open(fname, 'wb')
@@ -479,14 +479,14 @@ def buildRecipe(recipe, basedir, archList):
if os.path.exists(sourceArchive):
print "Using local copy of %s"%(name,)
print("Using local copy of %s"%(name,))
else:
print "Downloading %s"%(name,)
print("Downloading %s"%(name,))
downloadURL(url, sourceArchive)
print "Archive for %s stored as %s"%(name, sourceArchive)
print("Archive for %s stored as %s"%(name, sourceArchive))
print "Extracting archive for %s"%(name,)
print("Extracting archive for %s"%(name,))
buildDir=os.path.join(WORKDIR, '_bld')
if not os.path.exists(buildDir):
os.mkdir(buildDir)
@@ -549,14 +549,14 @@ def buildRecipe(recipe, basedir, archList):
configure_args.insert(0, configure)
configure_args = [ shellQuote(a) for a in configure_args ]
print "Running configure for %s"%(name,)
print("Running configure for %s"%(name,))
runCommand(' '.join(configure_args) + ' 2>&1')
print "Running install for %s"%(name,)
print("Running install for %s"%(name,))
runCommand('{ ' + install + ' ;} 2>&1')
print "Done %s"%(name,)
print ""
print("Done %s"%(name,))
print("")
os.chdir(curdir)
@@ -564,9 +564,9 @@ def buildLibraries():
"""
Build our dependencies into $WORKDIR/libraries/usr/local
"""
print ""
print "Building required libraries"
print ""
print("")
print("Building required libraries")
print("")
universal = os.path.join(WORKDIR, 'libraries')
os.mkdir(universal)
os.makedirs(os.path.join(universal, 'usr', 'local', 'lib'))
@@ -580,7 +580,7 @@ def buildLibraries():
def buildPythonDocs():
# This stores the documentation as Resources/English.lproj/Docuentation
# inside the framwork. pydoc and IDLE will pick it up there.
print "Install python documentation"
print("Install python documentation")
rootDir = os.path.join(WORKDIR, '_root')
version = getVersion()
docdir = os.path.join(rootDir, 'pydocs')
@@ -588,13 +588,13 @@ def buildPythonDocs():
name = 'html-%s.tar.bz2'%(getFullVersion(),)
sourceArchive = os.path.join(DEPSRC, name)
if os.path.exists(sourceArchive):
print "Using local copy of %s"%(name,)
print("Using local copy of %s"%(name,))
else:
print "Downloading %s"%(name,)
print("Downloading %s"%(name,))
downloadURL('http://www.python.org/ftp/python/doc/%s/%s'%(
getFullVersion(), name), sourceArchive)
print "Archive for %s stored as %s"%(name, sourceArchive)
print("Archive for %s stored as %s"%(name, sourceArchive))
extractArchive(os.path.dirname(docdir), sourceArchive)
os.rename(
@@ -604,7 +604,7 @@ def buildPythonDocs():
def buildPython():
print "Building a universal python"
print("Building a universal python")
buildDir = os.path.join(WORKDIR, '_bld', 'python')
rootDir = os.path.join(WORKDIR, '_root')
@@ -627,24 +627,24 @@ def buildPython():
# several paths.
version = getVersion()
print "Running configure..."
print("Running configure...")
runCommand("%s -C --enable-framework --enable-universalsdk=%s LDFLAGS='-g -L%s/libraries/usr/local/lib' OPT='-g -O3 -I%s/libraries/usr/local/include' 2>&1"%(
shellQuote(os.path.join(SRCDIR, 'configure')),
shellQuote(SDKPATH), shellQuote(WORKDIR)[1:-1],
shellQuote(WORKDIR)[1:-1]))
print "Running make"
print("Running make")
runCommand("make")
print "Running make frameworkinstall"
print("Running make frameworkinstall")
runCommand("make frameworkinstall DESTDIR=%s"%(
shellQuote(rootDir)))
print "Running make frameworkinstallextras"
print("Running make frameworkinstallextras")
runCommand("make frameworkinstallextras DESTDIR=%s"%(
shellQuote(rootDir)))
print "Copying required shared libraries"
print("Copying required shared libraries")
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
runCommand("mv %s/* %s"%(
shellQuote(os.path.join(
@@ -655,7 +655,7 @@ def buildPython():
'Python.framework', 'Versions', getVersion(),
'lib'))))
print "Fix file modes"
print("Fix file modes")
frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework')
gid = grp.getgrnam('admin').gr_gid
@@ -744,7 +744,7 @@ def packageFromRecipe(targetDir, recipe):
readme = textwrap.dedent(recipe['readme'])
isRequired = recipe.get('required', True)
print "- building package %s"%(pkgname,)
print("- building package %s"%(pkgname,))
# Substitute some variables
textvars = dict(
@@ -1047,9 +1047,9 @@ def main():
shutil.copy('../../LICENSE', os.path.join(WORKDIR, 'installer', 'License.txt'))
fp = open(os.path.join(WORKDIR, 'installer', 'Build.txt'), 'w')
print >> fp, "# BUILD INFO"
print >> fp, "# Date:", time.ctime()
print >> fp, "# By:", pwd.getpwuid(os.getuid()).pw_gecos
print("# BUILD INFO", file=fp)
print("# Date:", time.ctime(), file=fp)
print("# By:", pwd.getpwuid(os.getuid()).pw_gecos, file=fp)
fp.close()
# Custom icon for the DMG, shown when the DMG is mounted.

View File

@@ -69,9 +69,9 @@ class PICTwindow(FrameWork.Window):
self.resid = resid
picture = Qd.GetPicture(self.resid)
# Get rect for picture
print repr(picture.data[:16])
print(repr(picture.data[:16]))
sz, t, l, b, r = struct.unpack('hhhhh', picture.data[:10])
print 'pict:', t, l, b, r
print('pict:', t, l, b, r)
width = r-l
height = b-t
if width < 64: width = 64
@@ -79,7 +79,7 @@ class PICTwindow(FrameWork.Window):
if height < 64: height = 64
elif height > 320: height = 320
bounds = (LEFT, TOP, LEFT+width, TOP+height)
print 'bounds:', bounds
print('bounds:', bounds)
self.wid = Win.NewWindow(bounds, resname, 1, 0, -1, 1, 0)
self.wid.SetWindowPic(picture)

View File

@@ -68,9 +68,9 @@ class PICTwindow(FrameWork.Window):
self.resid = resid
picture = Qd.GetPicture(self.resid)
# Get rect for picture
print repr(picture.data[:16])
print(repr(picture.data[:16]))
sz, t, l, b, r = struct.unpack('hhhhh', picture.data[:10])
print 'pict:', t, l, b, r
print('pict:', t, l, b, r)
width = r-l
height = b-t
if width < 64: width = 64
@@ -78,7 +78,7 @@ class PICTwindow(FrameWork.Window):
if height < 64: height = 64
elif height > 320: height = 320
bounds = (LEFT, TOP, LEFT+width, TOP+height)
print 'bounds:', bounds
print('bounds:', bounds)
self.wid = Win.NewWindow(bounds, resname, 1, 0, -1, 1, 0)
self.wid.SetWindowPic(picture)
@@ -115,7 +115,7 @@ class MyDialog(FrameWork.DialogWindow):
(what, message, when, where, modifiers) = event
Qd.SetPort(self.wid)
where = Qd.GlobalToLocal(where)
print 'LISTHIT', where
print('LISTHIT', where)
if self.list.LClick(where, modifiers):
self.do_show()

View File

@@ -8,8 +8,8 @@ filespec = macfs.FSSpec('my disk image.img')
try:
objref = talker.create('my disk image', saving_as=filespec, leave_image_mounted=1)
except Disk_Copy.Error as arg:
print "ERROR: my disk image:", arg
print("ERROR: my disk image:", arg)
else:
print 'objref=', objref
print 'Type return to exit-'
print('objref=', objref)
print('Type return to exit-')
sys.stdin.readline()

View File

@@ -25,7 +25,7 @@ MAXHEIGHT=320
def main():
print 'hello world'
print('hello world')
imgbrowse()
class imgbrowse(FrameWork.Application):
@@ -84,10 +84,10 @@ class imgwindow(FrameWork.Window):
def do_update(self, *args):
pass
currect = self.fitrect()
print 'PICT:', self.pictrect
print 'WIND:', currect
print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
currect, QuickDraw.srcCopy, None)
print('PICT:', self.pictrect)
print('WIND:', currect)
print('ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
currect, QuickDraw.srcCopy, None))
self.info()
Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
currect, QuickDraw.srcCopy, None)

View File

@@ -38,19 +38,19 @@ def dumppixmap(data):
cmpCount, cmpSize, \
planeBytes, pmTable, pmReserved \
= struct.unpack("lhhhhhhhlllhhhhlll", data)
print 'Base: 0x%x'%baseAddr
print 'rowBytes: %d (0x%x)'%(rowBytes&0x3fff, rowBytes)
print 'rect: %d, %d, %d, %d'%(t, l, b, r)
print 'pmVersion: 0x%x'%pmVersion
print 'packing: %d %d'%(packType, packSize)
print 'resolution: %f x %f'%(float(hRes)/0x10000, float(vRes)/0x10000)
print 'pixeltype: %d, size %d'%(pixelType, pixelSize)
print 'components: %d, size %d'%(cmpCount, cmpSize)
print 'planeBytes: %d (0x%x)'%(planeBytes, planeBytes)
print 'pmTable: 0x%x'%pmTable
print 'pmReserved: 0x%x'%pmReserved
print('Base: 0x%x'%baseAddr)
print('rowBytes: %d (0x%x)'%(rowBytes&0x3fff, rowBytes))
print('rect: %d, %d, %d, %d'%(t, l, b, r))
print('pmVersion: 0x%x'%pmVersion)
print('packing: %d %d'%(packType, packSize))
print('resolution: %f x %f'%(float(hRes)/0x10000, float(vRes)/0x10000))
print('pixeltype: %d, size %d'%(pixelType, pixelSize))
print('components: %d, size %d'%(cmpCount, cmpSize))
print('planeBytes: %d (0x%x)'%(planeBytes, planeBytes))
print('pmTable: 0x%x'%pmTable)
print('pmReserved: 0x%x'%pmReserved)
for i in range(0, len(data), 16):
for j in range(16):
if i + j < len(data):
print '%02.2x'%ord(data[i+j]),
print
print('%02.2x'%ord(data[i+j]), end=' ')
print()

View File

@@ -18,7 +18,7 @@ import sys
# XXXX maxbounds = (40, 40, 1000, 1000)
def main():
print 'hello world' # XXXX
print('hello world') # XXXX
# skip the toolbox initializations, already done
# XXXX Should use gestalt here to check for quicktime version
Qt.EnterMovies()
@@ -75,7 +75,7 @@ def main():
whichWindow = Win.WhichWindow(message)
if not whichWindow:
# Probably the console window. Print something, hope it helps.
print 'update'
print('update')
else:
Qd.SetPort(whichWindow)
whichWindow.BeginUpdate()

View File

@@ -34,7 +34,7 @@ def copyres(src, dst):
id, type, name = res.GetResInfo()
size = res.SizeResource()
attrs = res.GetResAttrs()
print id, type, name, size, hex(attrs)
print(id, type, name, size, hex(attrs))
res.DetachResource()
UseResFile(output)
try:
@@ -42,15 +42,15 @@ def copyres(src, dst):
except (RuntimeError, Res.Error) as msg:
res2 = None
if res2:
print "Duplicate type+id, not copied"
print("Duplicate type+id, not copied")
print (res2.size, res2.data)
print res2.GetResInfo()
print(res2.GetResInfo())
if res2.HomeResFile() == output:
'OK'
elif res2.HomeResFile() == input:
'BAD!'
else:
print 'Home:', res2.HomeResFile()
print('Home:', res2.HomeResFile())
else:
res.AddResource(type, id, name)
#res.SetResAttrs(attrs)

View File

@@ -7,7 +7,7 @@ def list1resources():
ntypes = Res.Count1Types()
for itype in range(1, 1+ntypes):
type = Res.Get1IndType(itype)
print "Type:", repr(type)
print("Type:", repr(type))
nresources = Res.Count1Resources(type)
for i in range(1, 1 + nresources):
Res.SetResLoad(0)
@@ -19,7 +19,7 @@ def listresources():
ntypes = Res.CountTypes()
for itype in range(1, 1+ntypes):
type = Res.GetIndType(itype)
print "Type:", repr(type)
print("Type:", repr(type))
nresources = Res.CountResources(type)
for i in range(1, 1 + nresources):
Res.SetResLoad(0)
@@ -28,7 +28,7 @@ def listresources():
info(res)
def info(res):
print res.GetResInfo(), res.SizeResource(), decodeattrs(res.GetResAttrs())
print(res.GetResInfo(), res.SizeResource(), decodeattrs(res.GetResAttrs()))
attrnames = {
resChanged: 'Changed',
@@ -51,9 +51,9 @@ def decodeattrs(attrs):
return names
def test():
print "=== Local resourcess ==="
print("=== Local resourcess ===")
list1resources()
print "=== All resources ==="
print("=== All resources ===")
listresources()
if __name__ == '__main__':

View File

@@ -5,16 +5,16 @@ import aifc, audioop
fn = 'f:just samples:2ndbeat.aif'
af = aifc.open(fn, 'r')
print af.getparams()
print 'nframes =', af.getnframes()
print 'nchannels =', af.getnchannels()
print 'framerate =', af.getframerate()
print(af.getparams())
print('nframes =', af.getnframes())
print('nchannels =', af.getnchannels())
print('framerate =', af.getframerate())
nframes = min(af.getnframes(), 100000)
frames = af.readframes(nframes)
print 'len(frames) =', len(frames)
print repr(frames[:100])
print('len(frames) =', len(frames))
print(repr(frames[:100]))
frames = audioop.add(frames, '\x80'*len(frames), 1)
print repr(frames[:100])
print(repr(frames[:100]))
import struct
@@ -27,7 +27,7 @@ header1 = struct.pack('llhhllbbl',
0xFF,
60,
nframes)
print repr(header1)
print(repr(header1))
header2 = struct.pack('llhlll', 0, 0, 0, 0, 0, 0)
header3 = struct.pack('hhlll',
af.getsampwidth()*8,
@@ -35,7 +35,7 @@ header3 = struct.pack('hhlll',
0,
0,
0)
print repr(header3)
print(repr(header3))
header = header1 + header2 + header3
buffer = header + frames

View File

@@ -50,7 +50,7 @@ class TEWindow(ScrolledWindow):
height = self.ted.nLines * self.ted.lineHeight
vx = self.scalebarvalue(dr[0], dr[2]-dr[0], vr[0], vr[2])
vy = self.scalebarvalue(dr[1], dr[1]+height, vr[1], vr[3])
print dr, vr, height, vx, vy
print(dr, vr, height, vx, vy)
return None, vy
def scrollbar_callback(self, which, what, value):
@@ -72,12 +72,12 @@ class TEWindow(ScrolledWindow):
if delta >= 0:
delta = -self.ted.lineHeight
self.ted.TEPinScroll(0, delta)
print 'SCROLL Y', delta
print('SCROLL Y', delta)
else:
pass # No horizontal scrolling
def do_activate(self, onoff, evt):
print "ACTIVATE", onoff
print("ACTIVATE", onoff)
ScrolledWindow.do_activate(self, onoff, evt)
if onoff:
self.ted.TEActivate()
@@ -121,7 +121,7 @@ class TEWindow(ScrolledWindow):
if not self.path:
self.menu_save_as()
return # Will call us recursively
print 'Saving to ', self.path
print('Saving to ', self.path)
dhandle = self.ted.TEGetText()
data = dhandle.data
fp = open(self.path, 'wb') # NOTE: wb, because data has CR for end-of-line

View File

@@ -25,23 +25,23 @@ def copycleandir(src, dst):
assert cursrc.startswith(src)
curdst = dst + cursrc[len(src):]
if verbose:
print "mkdir", curdst
print("mkdir", curdst)
if not debug:
if not os.path.exists(curdst):
os.makedirs(curdst)
for fn in files:
if isclean(fn):
if verbose:
print "copy", os.path.join(cursrc, fn), os.path.join(curdst, fn)
print("copy", os.path.join(cursrc, fn), os.path.join(curdst, fn))
if not debug:
shutil.copy2(os.path.join(cursrc, fn), os.path.join(curdst, fn))
else:
if verbose:
print "skipfile", os.path.join(cursrc, fn)
print("skipfile", os.path.join(cursrc, fn))
for i in range(len(dirs)-1, -1, -1):
if not isclean(dirs[i]):
if verbose:
print "skipdir", os.path.join(cursrc, dirs[i])
print("skipdir", os.path.join(cursrc, dirs[i]))
del dirs[i]
def main():

View File

@@ -13,18 +13,18 @@ sys.path.append(BGENDIR)
from scantools import Scanner
def main():
print "=== Scanning AEDataModel.h, AppleEvents.h, AERegistry.h, AEObjects.h ==="
print("=== Scanning AEDataModel.h, AppleEvents.h, AERegistry.h, AEObjects.h ===")
input = ["AEDataModel.h", "AEInteraction.h", "AppleEvents.h", "AERegistry.h", "AEObjects.h"]
output = "aegen.py"
defsoutput = TOOLBOXDIR + "AppleEvents.py"
scanner = AppleEventsScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done Scanning and Generating, now doing 'import aesupport' ==="
print("=== Done Scanning and Generating, now doing 'import aesupport' ===")
import aesupport
print "=== Done 'import aesupport'. It's up to you to compile AEmodule.c ==="
print("=== Done 'import aesupport'. It's up to you to compile AEmodule.c ===")
class AppleEventsScanner(Scanner):

View File

@@ -17,11 +17,11 @@ def main():
scanner = MyScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now importing the generated code... ==="
print("=== Done scanning and generating, now importing the generated code... ===")
exec "import " + SHORT + "support"
print "=== Done. It's up to you to compile it now! ==="
print("=== Done. It's up to you to compile it now! ===")
class MyScanner(Scanner_OSX):

View File

@@ -17,11 +17,11 @@ def main():
scanner = MyScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now importing the generated code... ==="
print("=== Done scanning and generating, now importing the generated code... ===")
exec "import " + SHORT + "support"
print "=== Done. It's up to you to compile it now! ==="
print("=== Done. It's up to you to compile it now! ===")
class MyScanner(Scanner):

View File

@@ -12,18 +12,18 @@ sys.path.append(BGENDIR)
from scantools import Scanner, Scanner_OSX
def main():
print "---Scanning CarbonEvents.h---"
print("---Scanning CarbonEvents.h---")
input = ["CarbonEvents.h"]
output = "CarbonEventsgen.py"
defsoutput = TOOLBOXDIR + "CarbonEvents.py"
scanner = CarbonEvents_Scanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "--done scanning, importing--"
print("--done scanning, importing--")
import CarbonEvtsupport
print "done"
print("done")
RefObjectTypes = ["EventRef",
"EventQueueRef",

View File

@@ -44,11 +44,11 @@ def main():
scanner.scan()
scanner.gentypetest(SHORT+"typetest.py")
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now importing the generated code... ==="
print("=== Done scanning and generating, now importing the generated code... ===")
exec "import " + SHORT + "support"
print "=== Done. It's up to you to compile it now! ==="
print("=== Done. It's up to you to compile it now! ===")
class MyScanner(Scanner_OSX):

View File

@@ -22,11 +22,11 @@ def main():
scanner.scan()
scanner.gentypetest(SHORT+"typetest.py")
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now importing the generated code... ==="
print("=== Done scanning and generating, now importing the generated code... ===")
exec "import " + SHORT + "support"
print "=== Done. It's up to you to compile it now! ==="
print("=== Done. It's up to you to compile it now! ===")
class MyScanner(Scanner_OSX):

View File

@@ -16,11 +16,11 @@ def main():
scanner = MyScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now importing the generated code... ==="
print("=== Done scanning and generating, now importing the generated code... ===")
exec "import " + SHORT + "support"
print "=== Done. It's up to you to compile it now! ==="
print("=== Done. It's up to you to compile it now! ===")
class MyScanner(Scanner):

View File

@@ -14,11 +14,11 @@ def main():
scanner = MyScanner(input, output, defsoutput)
scanner.scan()
scanner.close()
print "=== Testing definitions output code ==="
print("=== Testing definitions output code ===")
exec(open(defsoutput).read(), {}, {})
print "=== Done scanning and generating, now doing 'import ctlsupport' ==="
print("=== Done scanning and generating, now doing 'import ctlsupport' ===")
import ctlsupport
print "=== Done. It's up to you to compile Ctlmodule.c ==="
print("=== Done. It's up to you to compile Ctlmodule.c ===")
class MyScanner(Scanner):

Some files were not shown because too many files have changed in this diff Show More