Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 65d09d4

Browse files
collinwcollinw
committed
Run 2to3 over Doc/tools/.
1 parent 89df245 commit 65d09d4

15 files changed

Lines changed: 66 additions & 64 deletions

‎Doc/tools/buildindex.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ def __init__(self, link, str, seqno):
3737
# build up the text
3838
self.text = split_entry_text(str)
3939
self.key = split_entry_key(str)
40+
41+
def __eq__(self, other):
42+
return cmp(self, other) == 0
43+
44+
def __lt__(self, other):
45+
return cmp(self, other) == -1
46+
47+
def __gt__(self, other):
48+
return cmp(self, other) == 1
4049

4150
def __cmp__(self, other):
4251
"""Comparison operator includes sequence number, for use with
@@ -380,8 +389,8 @@ def main():
380389
sys.stderr.write("\n%s: %d index nodes" % (program, num_nodes))
381390
else:
382391
open(ofn, "w").write(html)
383-
print
384-
print "%s: %d index nodes" % (program, num_nodes)
392+
print()
393+
print("%s: %d index nodes" % (program, num_nodes))
385394

386395

387396
if __name__ == "__main__":

‎Doc/tools/custlib.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
modules[base.lower()] = base
3232

3333
# Minor oddity: the types module is documented in libtypes2.tex
34-
if modules.has_key('types'):
34+
if 'types' in modules:
3535
del modules['types']
3636
modules['types2'] = None
3737

@@ -44,8 +44,8 @@
4444
modname = file[3:-4]
4545
docs[modname] = modname
4646

47-
mlist = modules.keys()
48-
mlist = filter(lambda x, docs=docs: docs.has_key(x), mlist)
47+
mlist = list(modules.keys())
48+
mlist = filter(lambda x, docs=docs: x in docs, mlist)
4949
mlist.sort()
5050
mlist = map(lambda x, docs=docs: docs[x], mlist)
5151

@@ -55,7 +55,7 @@
5555

5656
# Write the boilerplate
5757
# XXX should be fancied up.
58-
print """\documentstyle[twoside,11pt,myformat]{report}
58+
print("""\documentstyle[twoside,11pt,myformat]{report}
5959
\\title{Python Library Reference}
6060
\\input{boilerplate}
6161
\\makeindex % tell \\index to actually write the .idx file
@@ -68,11 +68,11 @@
6868
\\end{abstract}
6969
\\pagebreak
7070
{\\parskip = 0mm \\tableofcontents}
71-
\\pagebreak\\pagenumbering{arabic}"""
71+
\\pagebreak\\pagenumbering{arabic}""")
7272

7373
for modname in mlist:
74-
print "\\input{lib%s}" % (modname,)
74+
print("\\input{lib%s}" % (modname,))
7575

7676
# Write the end
77-
print """\\input{custlib.ind} % Index
78-
\\end{document}"""
77+
print("""\\input{custlib.ind} % Index
78+
\\end{document}""")

‎Doc/tools/getversioninfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ write_file(patchlevel_tex,
6868
"\\setshortversion{%s}\n"
6969
% (release, releaseinfo, shortversion))
7070

71-
print release + releaseinfo
71+
print(release + releaseinfo)

‎Doc/tools/keywords.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ def raw_input(prompt):
2121
nrows = (len(l)+ncols-1)/ncols
2222
for i in range(nrows):
2323
for j in range(i, len(l), nrows):
24-
print l[j].ljust(10),
25-
print
24+
print(l[j].ljust(10), end=' ')
25+
print()

‎Doc/tools/listmodules.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def main():
4040
for p in path:
4141
modules.update(getmodules(p))
4242

43-
keys = modules.keys()
44-
keys.sort()
43+
keys = sorted(modules.keys())
4544

4645
# filter out known test packages
4746
def cb(m):
@@ -79,7 +78,7 @@ def cb(m):
7978

8079
if out is not sys.stdout:
8180
out.close()
82-
print out.name, "ok (%d modules)" % len(modules)
81+
print(out.name, "ok (%d modules)" % len(modules))
8382

8483
def getmodules(p):
8584
# get modules in a given directory

‎Doc/tools/mkackshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def main():
2626
options.variables["title"] = "Acknowledgements"
2727
options.parse(sys.argv[1:])
2828
names = collect(sys.stdin)
29-
percol = (len(names) + options.columns - 1) / options.columns
29+
percol = (len(names) + options.columns - 1) // options.columns
3030
colnums = []
3131
for i in range(options.columns):
3232
colnums.append(percol*i)

‎Doc/tools/mkhowto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ PYTHON_BINARY = "python"
6565

6666

6767
def usage(options, file):
68-
print >>file, __doc__ % options
68+
print(__doc__ % options, file=file)
6969

7070
def error(options, message, err=2):
71-
print >>sys.stderr, message
72-
print >>sys.stderr
71+
print(message, file=sys.stderr)
72+
print(file=sys.stderr)
7373
usage(options, sys.stderr)
7474
sys.exit(2)
7575

@@ -132,7 +132,7 @@ class Options:
132132
try:
133133
return getattr(self, key)
134134
except AttributeError:
135-
raise KeyError, key
135+
raise KeyError(key)
136136

137137
def parse(self, args):
138138
opts, args = getopt.getopt(args, "Hi:a:s:lDkqr:",
@@ -289,7 +289,7 @@ class Job:
289289
if not imgs:
290290
self.warning(
291291
"Could not locate support images of type %s."
292-
% `self.options.image_type`)
292+
% repr(self.options.image_type))
293293
for fn in imgs:
294294
new_fn = os.path.join(self.builddir, os.path.basename(fn))
295295
shutil.copyfile(fn, new_fn)
@@ -534,7 +534,7 @@ class Job:
534534
def message(self, msg):
535535
msg = "+++ " + msg
536536
if not self.options.quiet:
537-
print msg
537+
print(msg)
538538
self.log(msg + "\n")
539539

540540
def warning(self, msg):

‎Doc/tools/mkmodindex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class IndexOptions(support.Options):
4949

5050
def usage(self):
5151
program = os.path.basename(sys.argv[0])
52-
print __doc__ % {"program": program}
52+
print(__doc__ % {"program": program})
5353

5454
links = [
5555
('author', 'acks.html', 'Acknowledgements'),
@@ -143,8 +143,8 @@ def main():
143143
if options.outputfile == "-":
144144
sys.stderr.write("%s: %d index nodes\n" % (program, num_nodes))
145145
else:
146-
print
147-
print "%s: %d index nodes" % (program, num_nodes)
146+
print()
147+
print("%s: %d index nodes" % (program, num_nodes))
148148

149149

150150
PLAT_DISCUSS = """

‎Doc/tools/prechm.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -413,15 +413,15 @@ def content(path, contentpage, output):
413413
def do_index(library, output):
414414
output.write('<UL>\n')
415415
for book in library:
416-
print '\t', book.title, '-', book.indexpage
416+
print('\t', book.title, '-', book.indexpage)
417417
if book.indexpage:
418418
index(book.directory, book.indexpage, output)
419419
output.write('</UL>\n')
420420

421421
def do_content(library, version, output):
422422
output.write(contents_header)
423423
for book in library:
424-
print '\t', book.title, '-', book.firstpage
424+
print('\t', book.title, '-', book.firstpage)
425425
path = book.directory + "/" + book.firstpage
426426
output.write('<LI>')
427427
output.write(object_sitemap % (book.title, path))
@@ -449,12 +449,12 @@ def openfile(file):
449449
try:
450450
p = open(file, "w")
451451
except IOError as msg:
452-
print file, ":", msg
452+
print(file, ":", msg)
453453
sys.exit(1)
454454
return p
455455

456456
def usage():
457-
print usage_mode
457+
print(usage_mode)
458458
sys.exit(0)
459459

460460
def do_it(args = None):
@@ -467,7 +467,7 @@ def do_it(args = None):
467467
try:
468468
optlist, args = getopt.getopt(args, 'ckpv:')
469469
except getopt.error as msg:
470-
print msg
470+
print(msg)
471471
usage()
472472

473473
if not args or len(args) > 1:
@@ -487,15 +487,15 @@ def do_it(args = None):
487487
if not (('-p','') in optlist):
488488
fname = arch + '.stp'
489489
f = openfile(fname)
490-
print "Building stoplist", fname, "..."
490+
print("Building stoplist", fname, "...")
491491
words = stop_list.split()
492492
words.sort()
493493
for word in words:
494-
print >> f, word
494+
print(word, file=f)
495495
f.close()
496496

497497
f = openfile(arch + '.hhp')
498-
print "Building Project..."
498+
print("Building Project...")
499499
do_project(library, f, arch, version)
500500
if version == '2.0.0':
501501
for image in os.listdir('icons'):
@@ -505,13 +505,13 @@ def do_it(args = None):
505505

506506
if not (('-c','') in optlist):
507507
f = openfile(arch + '.hhc')
508-
print "Building Table of Content..."
508+
print("Building Table of Content...")
509509
do_content(library, version, f)
510510
f.close()
511511

512512
if not (('-k','') in optlist):
513513
f = openfile(arch + '.hhk')
514-
print "Building Index..."
514+
print("Building Index...")
515515
do_index(library, f)
516516
f.close()
517517

‎Doc/tools/refcounts.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,23 @@ def __init__(self, name):
6969
def dump(d):
7070
"""Dump the data in the 'canonical' format, with functions in
7171
sorted order."""
72-
items = d.items()
73-
items.sort()
72+
items = sorted(d.items())
7473
first = 1
7574
for k, entry in items:
7675
if first:
7776
first = 0
7877
else:
79-
print
78+
print()
8079
s = entry.name + ":%s:%s:%s:"
8180
if entry.result_refs is None:
8281
r = ""
8382
else:
8483
r = entry.result_refs
85-
print s % (entry.result_type, "", r)
84+
print(s % (entry.result_type, "", r))
8685
for t, n, r in entry.args:
8786
if r is None:
8887
r = ""
89-
print s % (t, n, r)
88+
print(s % (t, n, r))
9089

9190

9291
def main():

0 commit comments

Comments
 (0)