Update of /cvsroot/pywin32/pywin32/AutoDuck In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20331/AutoDuck Modified Files: Tag: py3k BuildHHP.py Dump2HHC.py InsertExternalOverviews.py document_object.py makedfromi.py py2d.py Log Message: many more upgrades to py3k syntax Index: py2d.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/py2d.py,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** py2d.py 11 Sep 2004 07:43:38 -0000 1.1 --- py2d.py 26 Nov 2008 09:03:28 -0000 1.1.4.1 *************** *** 62,76 **** constants.append( (name, ob) ) info = BuildInfo(mod_name, mod) ! print >> fp, "// @module %s|%s" % (mod_name, format_desc(info.desc)) for ob in functions: ! print >> fp, "// @pymeth %s|%s" % (ob.name, ob.short_desc) for ob in functions: ! print >> fp, "// @pymethod |%s|%s|%s" % (mod_name, ob.name, format_desc(ob.desc)) for ai in BuildArgInfos(ob.ob): ! print >> fp, "// @pyparm |%s|%s|%s" % (ai.name, ai.default, ai.short_desc) for ob in classes: ob_name = mod_name + "." + ob.name ! print >> fp, "// @object %s|%s" % (ob_name, format_desc(ob.desc)) func_infos = [] for n, o in ob.ob.__dict__.items(): --- 62,76 ---- constants.append( (name, ob) ) info = BuildInfo(mod_name, mod) ! print("// @module %s|%s" % (mod_name, format_desc(info.desc)), file=fp) for ob in functions: ! print("// @pymeth %s|%s" % (ob.name, ob.short_desc), file=fp) for ob in functions: ! print("// @pymethod |%s|%s|%s" % (mod_name, ob.name, format_desc(ob.desc)), file=fp) for ai in BuildArgInfos(ob.ob): ! print("// @pyparm |%s|%s|%s" % (ai.name, ai.default, ai.short_desc), file=fp) for ob in classes: ob_name = mod_name + "." + ob.name ! print("// @object %s|%s" % (ob_name, format_desc(ob.desc)), file=fp) func_infos = [] for n, o in ob.ob.__dict__.items(): *************** *** 79,87 **** func_infos.append(info) for fi in func_infos: ! print >> fp, "// @pymeth %s|%s" % (fi.name, fi.short_desc) for fi in func_infos: ! print >> fp, "// @pymethod |%s|%s|%s" % (ob_name, fi.name, format_desc(fi.desc)) for ai in BuildArgInfos(fi.ob): ! print >> fp, "// @pyparm |%s|%s|%s" % (ai.name, ai.default, ai.short_desc) for (name, val) in constants: --- 79,87 ---- func_infos.append(info) for fi in func_infos: ! print("// @pymeth %s|%s" % (fi.name, fi.short_desc), file=fp) for fi in func_infos: ! print("// @pymethod |%s|%s|%s" % (ob_name, fi.name, format_desc(fi.desc)), file=fp) for ai in BuildArgInfos(fi.ob): ! print("// @pyparm |%s|%s|%s" % (ai.name, ai.default, ai.short_desc), file=fp) for (name, val) in constants: *************** *** 89,96 **** if type(val) in (int, long): desc += " (0x%x)" % (val,) ! print >> fp, "// @const %s|%s|%s" % (mod_name, name, desc) def main(fp, args): ! print >> fp, "// @doc" for arg in args: build_module(sys.stdout, arg) --- 89,96 ---- if type(val) in (int, long): desc += " (0x%x)" % (val,) ! print("// @const %s|%s|%s" % (mod_name, name, desc), file=fp) def main(fp, args): ! print("// @doc", file=fp) for arg in args: build_module(sys.stdout, arg) Index: makedfromi.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/makedfromi.py,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** makedfromi.py 11 Jul 2006 06:58:52 -0000 1.8 --- makedfromi.py 26 Nov 2008 09:03:28 -0000 1.8.4.1 *************** *** 80,84 **** extra_tags.append("// " + doc + '\n') except: ! print "Line %d is badly formed - %s" % (lineNo, str(sys.exc_value)) lineNo = lineNo + 1 --- 80,84 ---- extra_tags.append("// " + doc + '\n') except: ! print("Line %d is badly formed - %s" % (lineNo, str(sys.exc_value))) lineNo = lineNo + 1 *************** *** 109,113 **** fields = string.split(meth,'|') if len(fields)<>3: ! print "**Error - %s does not have enough fields" % meth else: outFile.write("// @pymethod %s|%s|%s|%s\n" % (fields[0],thisModName,fields[1], fields[2])) --- 109,113 ---- fields = string.split(meth,'|') if len(fields)<>3: ! print("**Error - %s does not have enough fields" % meth) else: outFile.write("// @pymethod %s|%s|%s|%s\n" % (fields[0],thisModName,fields[1], fields[2])) *************** *** 143,149 **** outName = a msg = string.join(args) ! except getopt.error, msg: ! print msg ! print "Usage: %s [-o output_name] [-p com_parent] filename" % sys.argv[0] return --- 143,149 ---- outName = a msg = string.join(args) ! except getopt.error as msg: ! print(msg) ! print("Usage: %s [-o output_name] [-p com_parent] filename" % sys.argv[0]) return Index: Dump2HHC.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/Dump2HHC.py,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** Dump2HHC.py 11 Sep 2004 07:39:43 -0000 1.6 --- Dump2HHC.py 26 Nov 2008 09:03:28 -0000 1.6.4.1 *************** *** 143,147 **** if d.has_key(top.name): ! print "Duplicate named %s detected: %s" % (top.type, top.name) # Skip the property fields line for module/object --- 143,147 ---- if d.has_key(top.name): ! print("Duplicate named %s detected: %s" % (top.type, top.name)) # Skip the property fields line for module/object Index: BuildHHP.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/BuildHHP.py,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -C2 -d -r1.9 -r1.9.4.1 *** BuildHHP.py 11 Sep 2004 07:40:22 -0000 1.9 --- BuildHHP.py 26 Nov 2008 09:03:28 -0000 1.9.4.1 *************** *** 40,44 **** new = glob.glob(g) if len(new)==0: ! print "The pattern '%s' yielded no files!" % (g,) lFiles = lFiles + new # lFiles is now the list of origin files. --- 40,44 ---- new = glob.glob(g) if len(new)==0: ! print("The pattern '%s' yielded no files!" % (g,)) lFiles = lFiles + new # lFiles is now the list of origin files. *************** *** 66,70 **** # else we have a trailing slash - it means we _expect_ it to be a patch as-is. assert os.path.isdir(sCommonPrefix) and sCommonPrefix[-1]=="\\", "commonprefix splitting aint gunna work!" ! print "sCommonPrefix=", sCommonPrefix # Ok, now remove this common prefix from every file: lRelativeFiles = [] --- 66,70 ---- # else we have a trailing slash - it means we _expect_ it to be a patch as-is. assert os.path.isdir(sCommonPrefix) and sCommonPrefix[-1]=="\\", "commonprefix splitting aint gunna work!" ! print("sCommonPrefix=", sCommonPrefix) # Ok, now remove this common prefix from every file: lRelativeFiles = [] Index: InsertExternalOverviews.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/InsertExternalOverviews.py,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** InsertExternalOverviews.py 31 May 2005 12:40:05 -0000 1.2 --- InsertExternalOverviews.py 26 Nov 2008 09:03:28 -0000 1.2.4.1 *************** *** 45,49 **** def main(): if len(sys.argv) != 2: ! print "Invalid args" sys.exit(1) file = sys.argv[1] --- 45,49 ---- def main(): if len(sys.argv) != 2: ! print("Invalid args") sys.exit(1) file = sys.argv[1] Index: document_object.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/AutoDuck/document_object.py,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** document_object.py 31 May 2005 12:40:05 -0000 1.2 --- document_object.py 26 Nov 2008 09:03:28 -0000 1.2.4.1 *************** *** 68,80 **** if __name__=='__main__': doc = GetDocument() ! print "Important Notes" for link in doc.important: ! print " ", link.name, link.href ! print "Doc links" for link in doc.links: ! print " ", link.name, link.href ! print "Doc categories" for c in doc: ! print " ", c.id, c.label \ No newline at end of file --- 68,80 ---- if __name__=='__main__': doc = GetDocument() ! print("Important Notes") for link in doc.important: ! print(" ", link.name, link.href) ! print("Doc links") for link in doc.links: ! print(" ", link.name, link.href) ! print("Doc categories") for c in doc: ! print(" ", c.id, c.label) |
