mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Run 2to3's print fixer over some places that had been missed.
This commit is contained in:
		
							parent
							
								
									716c3ac40c
								
							
						
					
					
						commit
						e7bf59f500
					
				
					 51 changed files with 253 additions and 253 deletions
				
			
		|  | @ -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. | ||||
|  |  | |||
|  | @ -69,9 +69,9 @@ def open(self, (resid, resname)): | |||
|         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 @@ def open(self, (resid, resname)): | |||
|         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) | ||||
|  |  | |||
|  | @ -68,9 +68,9 @@ def open(self, (resid, resname)): | |||
|         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 @@ def open(self, (resid, resname)): | |||
|         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 @@ def do_listhit(self, event): | |||
|         (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() | ||||
| 
 | ||||
|  |  | |||
|  | @ -8,8 +8,8 @@ | |||
| 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() | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ | |||
| 
 | ||||
| 
 | ||||
| def main(): | ||||
|     print 'hello world' | ||||
|     print('hello world') | ||||
|     imgbrowse() | ||||
| 
 | ||||
| class imgbrowse(FrameWork.Application): | ||||
|  | @ -84,10 +84,10 @@ def open(self, width, height, pixmap, data): | |||
|     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) | ||||
|  |  | |||
|  | @ -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() | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ | |||
| # 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() | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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__': | ||||
|  |  | |||
|  | @ -5,16 +5,16 @@ | |||
| 
 | ||||
| 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 @@ | |||
|                       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 @@ | |||
|                       0, | ||||
|                       0, | ||||
|                       0) | ||||
| print repr(header3) | ||||
| print(repr(header3)) | ||||
| header = header1 + header2 + header3 | ||||
| 
 | ||||
| buffer = header + frames | ||||
|  |  | |||
|  | @ -50,7 +50,7 @@ def getscrollbarvalues(self): | |||
|         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 @@ def scrollbar_callback(self, which, what, value): | |||
|                 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 @@ def menu_save(self): | |||
|         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 | ||||
|  |  | |||
|  | @ -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(): | ||||
|  |  | |||
|  | @ -13,18 +13,18 @@ | |||
| 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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -12,18 +12,18 @@ | |||
| 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", | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -18,11 +18,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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -25,11 +25,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 dragsupport' ===" | ||||
|     print("=== Done scanning and generating, now doing 'import dragsupport' ===") | ||||
|     import dragsupport | ||||
|     print "=== Done.  It's up to you to compile Dragmodule.c ===" | ||||
|     print("=== Done.  It's up to you to compile Dragmodule.c ===") | ||||
| 
 | ||||
| class MyScanner(Scanner): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -17,11 +17,11 @@ def main(): | |||
|     scanner.scan() | ||||
|     scanner.close() | ||||
|     scanner.gentypetest(SHORT+"typetest.py") | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -18,11 +18,11 @@ def main(): | |||
|     scanner.scan() | ||||
|     scanner.close() | ||||
|     scanner.gentypetest(SHORT+"typetest.py") | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -10,18 +10,18 @@ | |||
| from scantools import Scanner_OSX | ||||
| 
 | ||||
| def main(): | ||||
|     print "---Scanning IBCarbonRuntime.h---" | ||||
|     print("---Scanning IBCarbonRuntime.h---") | ||||
|     input = ["IBCarbonRuntime.h"] | ||||
|     output = "IBCarbongen.py" | ||||
|     defsoutput = TOOLBOXDIR + "IBCarbonRuntime.py" | ||||
|     scanner = IBCarbon_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 IBCarbonsupport | ||||
|     print "done" | ||||
|     print("done") | ||||
| 
 | ||||
| class IBCarbon_Scanner(Scanner_OSX): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -18,11 +18,11 @@ def main(): | |||
|     scanner.scan() | ||||
|     scanner.close() | ||||
|     scanner.gentypetest(SHORT+"typetest.py") | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -13,11 +13,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 menusupport' ===" | ||||
|     print("=== Done scanning and generating, now doing 'import menusupport' ===") | ||||
|     import menusupport | ||||
|     print "=== Done.  It's up to you to compile Menumodule.c ===" | ||||
|     print("=== Done.  It's up to you to compile Menumodule.c ===") | ||||
| 
 | ||||
| class MyScanner(Scanner): | ||||
| 
 | ||||
|  |  | |||
|  | @ -19,11 +19,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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -17,11 +17,11 @@ def main(): | |||
|     scanner.scan() | ||||
|     scanner.close() | ||||
|     scanner.gentypetest(SHORT+"typetest.py") | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -28,7 +28,7 @@ def main(): | |||
|     except IOError: | ||||
|         pass | ||||
|     if have_extra: | ||||
|         print "=== Copying QuickDrawText stuff into main files... ===" | ||||
|         print("=== Copying QuickDrawText stuff into main files... ===") | ||||
|         ifp = open("@qdgentext.py") | ||||
|         ofp = open("qdgen.py", "a") | ||||
|         ofp.write(ifp.read()) | ||||
|  | @ -40,11 +40,11 @@ def main(): | |||
|         ifp.close() | ||||
|         ofp.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... ===") | ||||
|     import qdsupport | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -13,11 +13,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... ===") | ||||
|     import qdoffssupport | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -34,11 +34,11 @@ def main(): | |||
|     scanner.scan() | ||||
|     scanner.close() | ||||
|     scanner.gentypetest(SHORT+"typetest.py") | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -19,11 +19,11 @@ def main(): | |||
|     scanner = ResourcesScanner(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 ressupport' ===" | ||||
|     print("=== Done scanning and generating, now doing 'import ressupport' ===") | ||||
|     import ressupport | ||||
|     print "=== Done 'import ressupport'.  It's up to you to compile Resmodule.c ===" | ||||
|     print("=== Done 'import ressupport'.  It's up to you to compile Resmodule.c ===") | ||||
| 
 | ||||
| class ResourcesScanner(Scanner): | ||||
| 
 | ||||
|  |  | |||
|  | @ -21,9 +21,9 @@ def main(): | |||
|     scanner.close() | ||||
| ##      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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -16,11 +16,11 @@ def main(): | |||
|     scanner = SoundScanner(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 sndsupport' ===" | ||||
|     print("=== Done scanning and generating, now doing 'import sndsupport' ===") | ||||
|     import sndsupport | ||||
|     print "=== Done.  It's up to you to compile Sndmodule.c ===" | ||||
|     print("=== Done.  It's up to you to compile Sndmodule.c ===") | ||||
| 
 | ||||
| class SoundScanner(Scanner): | ||||
| 
 | ||||
|  |  | |||
|  | @ -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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -13,11 +13,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... ===") | ||||
|     import winsupport | ||||
|     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): | ||||
| 
 | ||||
|  |  | |||
|  | @ -100,7 +100,7 @@ def hackFile(self,d,f): | |||
|         if os.path.isdir(origPath): | ||||
|             self.mkpath(outPath) | ||||
|         elif ext == '.html': | ||||
|             if self.verbose: print 'hacking %s to %s' % (origPath,outPath) | ||||
|             if self.verbose: print('hacking %s to %s' % (origPath,outPath)) | ||||
|             hackedFile = file(outPath, 'w') | ||||
|             origFile = file(origPath,'r') | ||||
|             hackedFile.write(self.r.sub('<dl><dt><dd>', origFile.read())) | ||||
|  | @ -118,7 +118,7 @@ def visit(self, dummy, dirname, filenames): | |||
|     def makeHelpIndex(self): | ||||
|         app = '/Developer/Applications/Apple Help Indexing Tool.app' | ||||
|         self.spawn('open', '-a', app , self.build_dest) | ||||
|         print "Please wait until Apple Help Indexing Tool finishes before installing" | ||||
|         print("Please wait until Apple Help Indexing Tool finishes before installing") | ||||
| 
 | ||||
|     def makeHelpIndex(self): | ||||
|         app = HelpIndexingTool.HelpIndexingTool(start=1) | ||||
|  | @ -180,18 +180,18 @@ def finalize_options(self): | |||
|             self.build_dest = build_cmd.build_dest | ||||
|         if self.install_doc == None: | ||||
|             self.install_doc = os.path.join(self.prefix, DESTDIR) | ||||
|         print 'INSTALL', self.build_dest, '->', self.install_doc | ||||
|         print('INSTALL', self.build_dest, '->', self.install_doc) | ||||
| 
 | ||||
|     def run(self): | ||||
|         self.finalize_options() | ||||
|         self.ensure_finalized() | ||||
|         print "Running Installer" | ||||
|         print("Running Installer") | ||||
|         instloc = self.install_doc | ||||
|         if self.root: | ||||
|             instloc = change_root(self.root, instloc) | ||||
|         self.mkpath(instloc) | ||||
|         copy_tree(self.build_dest, instloc) | ||||
|         print "Installation complete" | ||||
|         print("Installation complete") | ||||
| 
 | ||||
| def mungeVersion(infile, outfile): | ||||
|     i = file(infile,'r') | ||||
|  |  | |||
|  | @ -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: | ||||
|  |  | |||
|  | @ -116,18 +116,18 @@ def buildapplet(): | |||
|                         progress=verbose, destroot=destroot) | ||||
| 
 | ||||
| def usage(): | ||||
|     print "BuildApplet creates an application from a Python source file" | ||||
|     print "Usage:" | ||||
|     print "  BuildApplet     interactive, single file, no options" | ||||
|     print "  BuildApplet src1.py src2.py ...   non-interactive multiple file" | ||||
|     print "  BuildApplet [options] src.py    non-interactive single file" | ||||
|     print "Options:" | ||||
|     print "  --output o        Output file; default based on source filename, short -o" | ||||
|     print "  --resource r      Resource file; default based on source filename, short -r" | ||||
|     print "  --noargv          Build applet without drag-and-drop sys.argv emulation, short -n, OSX only" | ||||
|     print "  --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only" | ||||
|     print "  --verbose         Verbose, short -v" | ||||
|     print "  --help            This message, short -?" | ||||
|     print("BuildApplet creates an application from a Python source file") | ||||
|     print("Usage:") | ||||
|     print("  BuildApplet     interactive, single file, no options") | ||||
|     print("  BuildApplet src1.py src2.py ...   non-interactive multiple file") | ||||
|     print("  BuildApplet [options] src.py    non-interactive single file") | ||||
|     print("Options:") | ||||
|     print("  --output o        Output file; default based on source filename, short -o") | ||||
|     print("  --resource r      Resource file; default based on source filename, short -r") | ||||
|     print("  --noargv          Build applet without drag-and-drop sys.argv emulation, short -n, OSX only") | ||||
|     print("  --extra src[:dst] Extra file to put in .app bundle, short -e, OSX only") | ||||
|     print("  --verbose         Verbose, short -v") | ||||
|     print("  --help            This message, short -?") | ||||
|     sys.exit(1) | ||||
| 
 | ||||
| class Verbose: | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ | |||
| 
 | ||||
| def bgenone(dirname, shortname): | ||||
|     os.chdir(dirname) | ||||
|     print '%s:'%shortname | ||||
|     print('%s:'%shortname) | ||||
|     # Sigh, we don't want to lose CVS history, so two | ||||
|     # modules have funny names: | ||||
|     if shortname == 'carbonevt': | ||||
|  | @ -18,12 +18,12 @@ def bgenone(dirname, shortname): | |||
|     try: | ||||
|         m = __import__(modulename) | ||||
|     except: | ||||
|         print "Error:", shortname, sys.exc_info()[1] | ||||
|         print("Error:", shortname, sys.exc_info()[1]) | ||||
|         return 0 | ||||
|     try: | ||||
|         m.main() | ||||
|     except: | ||||
|         print "Error:", shortname, sys.exc_info()[1] | ||||
|         print("Error:", shortname, sys.exc_info()[1]) | ||||
|         return 0 | ||||
|     return 1 | ||||
| 
 | ||||
|  | @ -45,9 +45,9 @@ def main(): | |||
|                 success.append(name) | ||||
|             else: | ||||
|                 failure.append(name) | ||||
|     print 'Done:', string.join(success, ' ') | ||||
|     print('Done:', string.join(success, ' ')) | ||||
|     if failure: | ||||
|         print 'Failed:', string.join(failure, ' ') | ||||
|         print('Failed:', string.join(failure, ' ')) | ||||
|         return 0 | ||||
|     return 1 | ||||
| 
 | ||||
|  |  | |||
|  | @ -417,18 +417,18 @@ def printUsage(): | |||
|     "Print usage message." | ||||
| 
 | ||||
|     format = "Usage: %s <opts1> [<opts2>] <root> [<resources>]" | ||||
|     print format % basename(sys.argv[0]) | ||||
|     print | ||||
|     print "       with arguments:" | ||||
|     print "           (mandatory) root:         the package root folder" | ||||
|     print "           (optional)  resources:    the package resources folder" | ||||
|     print | ||||
|     print "       and options:" | ||||
|     print "           (mandatory) opts1:" | ||||
|     print(format % basename(sys.argv[0])) | ||||
|     print() | ||||
|     print("       with arguments:") | ||||
|     print("           (mandatory) root:         the package root folder") | ||||
|     print("           (optional)  resources:    the package resources folder") | ||||
|     print() | ||||
|     print("       and options:") | ||||
|     print("           (mandatory) opts1:") | ||||
|     mandatoryKeys = string.split("Title Version Description", " ") | ||||
|     for k in mandatoryKeys: | ||||
|         print "               --%s" % k | ||||
|     print "           (optional) opts2: (with default values)" | ||||
|         print("               --%s" % k) | ||||
|     print("           (optional) opts2: (with default values)") | ||||
| 
 | ||||
|     pmDefaults = PackageMaker.packageInfoDefaults | ||||
|     optionalKeys = pmDefaults.keys() | ||||
|  | @ -439,7 +439,7 @@ def printUsage(): | |||
|     for k in optionalKeys: | ||||
|         format = "               --%%s:%s %%s" | ||||
|         format = format % (" " * (maxKeyLen-len(k))) | ||||
|         print format % (k, repr(pmDefaults[k])) | ||||
|         print(format % (k, repr(pmDefaults[k]))) | ||||
| 
 | ||||
| 
 | ||||
| def main(): | ||||
|  | @ -452,7 +452,7 @@ def main(): | |||
|     try: | ||||
|         opts, args = getopt.getopt(sys.argv[1:], shortOpts, longOpts) | ||||
|     except getopt.GetoptError as details: | ||||
|         print details | ||||
|         print(details) | ||||
|         printUsage() | ||||
|         return | ||||
| 
 | ||||
|  | @ -462,11 +462,11 @@ def main(): | |||
| 
 | ||||
|     ok = optsDict.keys() | ||||
|     if not (1 <= len(args) <= 2): | ||||
|         print "No argument given!" | ||||
|         print("No argument given!") | ||||
|     elif not ("Title" in ok and \ | ||||
|               "Version" in ok and \ | ||||
|               "Description" in ok): | ||||
|         print "Missing mandatory option!" | ||||
|         print("Missing mandatory option!") | ||||
|     else: | ||||
|         buildPackage(*args, **optsDict) | ||||
|         return | ||||
|  |  | |||
|  | @ -68,9 +68,9 @@ def parse_errno_h(fp, dict): | |||
|             if not dict.has_key(number): | ||||
|                 dict[number] = desc, name | ||||
|             else: | ||||
|                 print 'DUPLICATE', number | ||||
|                 print '\t', dict[number] | ||||
|                 print '\t', (desc, name) | ||||
|                 print('DUPLICATE', number) | ||||
|                 print('\t', dict[number]) | ||||
|                 print('\t', (desc, name)) | ||||
| 
 | ||||
| def parse_errors_h(fp, dict): | ||||
|     errno_prog = re.compile(ERRORS_PROG) | ||||
|  | @ -95,11 +95,11 @@ def parse_errors_h(fp, dict): | |||
|             if not dict.has_key(number): | ||||
|                 dict[number] = desc, name | ||||
|             else: | ||||
|                 print 'DUPLICATE', number | ||||
|                 print '\t', dict[number] | ||||
|                 print '\t', (desc, name) | ||||
|                 print('DUPLICATE', number) | ||||
|                 print('\t', dict[number]) | ||||
|                 print('\t', (desc, name)) | ||||
|                 if len(desc) > len(dict[number][0]): | ||||
|                     print 'Pick second one' | ||||
|                     print('Pick second one') | ||||
|                     dict[number] = desc, name | ||||
| 
 | ||||
| def main(): | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ def main(): | |||
|                 sys.exit(0) | ||||
|             zappyc(dir) | ||||
|         else: | ||||
|             print 'Usage: zappyc dir ...' | ||||
|             print('Usage: zappyc dir ...') | ||||
|             sys.exit(1) | ||||
|     for dir in sys.argv[1:]: | ||||
|         zappyc(dir) | ||||
|  | @ -28,7 +28,7 @@ def walker(dummy, top, names): | |||
|     for name in names: | ||||
|         if name[-4:] in ('.pyc', '.pyo'): | ||||
|             path = os.path.join(top, name) | ||||
|             print 'Zapping', path | ||||
|             print('Zapping', path) | ||||
|             if doit: | ||||
|                 os.unlink(path) | ||||
| 
 | ||||
|  |  | |||
|  | @ -62,16 +62,16 @@ def test_recurse(): | |||
| def check_limit(n, test_func_name): | ||||
|     sys.setrecursionlimit(n) | ||||
|     if test_func_name.startswith("test_"): | ||||
|         print test_func_name[5:] | ||||
|         print(test_func_name[5:]) | ||||
|     else: | ||||
|         print test_func_name | ||||
|         print(test_func_name) | ||||
|     test_func = globals()[test_func_name] | ||||
|     try: | ||||
|         test_func() | ||||
|     except RuntimeError: | ||||
|         pass | ||||
|     else: | ||||
|         print "Yikes!" | ||||
|         print("Yikes!") | ||||
| 
 | ||||
| limit = 1000 | ||||
| while 1: | ||||
|  | @ -81,5 +81,5 @@ def check_limit(n, test_func_name): | |||
|     check_limit(limit, "test_init") | ||||
|     check_limit(limit, "test_getattr") | ||||
|     check_limit(limit, "test_getitem") | ||||
|     print "Limit of %d is fine" % limit | ||||
|     print("Limit of %d is fine" % limit) | ||||
|     limit = limit + 100 | ||||
|  |  | |||
|  | @ -22,14 +22,14 @@ | |||
|            }[level] | ||||
| string = sys.version.split()[0] # like '2.3a0' | ||||
| 
 | ||||
| print " * For %s," % string | ||||
| print " * PY_MICRO_VERSION = %d" % micro | ||||
| print " * PY_RELEASE_LEVEL = %r = %s" % (level, hex(levelnum)) | ||||
| print " * PY_RELEASE_SERIAL = %d" % serial | ||||
| print " *" | ||||
| print(" * For %s," % string) | ||||
| print(" * PY_MICRO_VERSION = %d" % micro) | ||||
| print(" * PY_RELEASE_LEVEL = %r = %s" % (level, hex(levelnum))) | ||||
| print(" * PY_RELEASE_SERIAL = %d" % serial) | ||||
| print(" *") | ||||
| 
 | ||||
| field3 = micro * 1000 + levelnum * 10 + serial | ||||
| 
 | ||||
| print " * and %d*1000 + %d*10 + %d = %d" % (micro, levelnum, serial, field3) | ||||
| print " */" | ||||
| print "#define FIELD3", field3 | ||||
| print(" * and %d*1000 + %d*10 + %d = %d" % (micro, levelnum, serial, field3)) | ||||
| print(" */") | ||||
| print("#define FIELD3", field3) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Collin Winter
						Collin Winter