mirror of
https://github.com/python/cpython.git
synced 2025-09-19 07:00:59 +00:00
Minor performance nits.
This commit is contained in:
parent
2e6c13f150
commit
a94d21f44e
2 changed files with 36 additions and 32 deletions
|
@ -24,19 +24,20 @@ import StringIO
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def strcasecmp(e1, e2, lower=string.lower):
|
def cmp_entries(e1, e2, lower=string.lower):
|
||||||
return cmp(lower(e1[1]), lower(e2[1])) or cmp(e1, e2)
|
return cmp(lower(e1[1]), lower(e2[1])) or cmp(e1, e2)
|
||||||
|
|
||||||
|
|
||||||
def dump_entries(ofp, entries):
|
def dump_entries(write, entries):
|
||||||
if len(entries) == 1:
|
if len(entries) == 1:
|
||||||
ofp.write(" \\item %s (%s)%s\n" % entries[0])
|
write(" \\item %s (%s)%s\n" % entries[0])
|
||||||
return
|
return
|
||||||
ofp.write(" \item %s\n" % entries[0][0])
|
write(" \item %s\n" % entries[0][0])
|
||||||
# now sort these in a case insensitive manner:
|
# now sort these in a case insensitive manner:
|
||||||
entries.sort(strcasecmp)
|
if len(entries) > 0:
|
||||||
|
entries.sort(cmp_entries)
|
||||||
for xxx, subitem, pages in entries:
|
for xxx, subitem, pages in entries:
|
||||||
ofp.write(" \subitem %s%s\n" % (subitem, pages))
|
write(" \subitem %s%s\n" % (subitem, pages))
|
||||||
|
|
||||||
|
|
||||||
breakable_re = re.compile(r" \\item (.*) [(](.*)[)]((?:, \d+)+)")
|
breakable_re = re.compile(r" \\item (.*) [(](.*)[)]((?:, \d+)+)")
|
||||||
|
@ -55,27 +56,28 @@ def main():
|
||||||
else:
|
else:
|
||||||
fp = open(filename)
|
fp = open(filename)
|
||||||
ofp = StringIO.StringIO()
|
ofp = StringIO.StringIO()
|
||||||
item, subitem = None, None
|
|
||||||
entries = []
|
entries = []
|
||||||
|
match = breakable_re.match
|
||||||
|
write = ofp.write
|
||||||
while 1:
|
while 1:
|
||||||
line = fp.readline()
|
line = fp.readline()
|
||||||
if not line:
|
if not line:
|
||||||
break
|
break
|
||||||
m = breakable_re.match(line)
|
m = match(line)
|
||||||
if m:
|
if m:
|
||||||
entry = m.group(1, 2, 3)
|
entry = m.group(1, 2, 3)
|
||||||
if entries:
|
if entries and entries[-1][0] != entry[0]:
|
||||||
if entries[-1][0] != entry[0]:
|
dump_entries(write, entries)
|
||||||
dump_entries(ofp, entries)
|
|
||||||
entries = []
|
entries = []
|
||||||
entries.append(entry)
|
entries.append(entry)
|
||||||
elif entries:
|
elif entries:
|
||||||
dump_entries(ofp, entries)
|
dump_entries(write, entries)
|
||||||
entries = []
|
entries = []
|
||||||
ofp.write(line)
|
write(line)
|
||||||
else:
|
else:
|
||||||
pass
|
write(line)
|
||||||
ofp.write(line)
|
del write
|
||||||
|
del match
|
||||||
fp.close()
|
fp.close()
|
||||||
if outfile == "-":
|
if outfile == "-":
|
||||||
fp = sys.stdout
|
fp = sys.stdout
|
||||||
|
|
|
@ -24,19 +24,20 @@ import StringIO
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def strcasecmp(e1, e2, lower=string.lower):
|
def cmp_entries(e1, e2, lower=string.lower):
|
||||||
return cmp(lower(e1[1]), lower(e2[1])) or cmp(e1, e2)
|
return cmp(lower(e1[1]), lower(e2[1])) or cmp(e1, e2)
|
||||||
|
|
||||||
|
|
||||||
def dump_entries(ofp, entries):
|
def dump_entries(write, entries):
|
||||||
if len(entries) == 1:
|
if len(entries) == 1:
|
||||||
ofp.write(" \\item %s (%s)%s\n" % entries[0])
|
write(" \\item %s (%s)%s\n" % entries[0])
|
||||||
return
|
return
|
||||||
ofp.write(" \item %s\n" % entries[0][0])
|
write(" \item %s\n" % entries[0][0])
|
||||||
# now sort these in a case insensitive manner:
|
# now sort these in a case insensitive manner:
|
||||||
entries.sort(strcasecmp)
|
if len(entries) > 0:
|
||||||
|
entries.sort(cmp_entries)
|
||||||
for xxx, subitem, pages in entries:
|
for xxx, subitem, pages in entries:
|
||||||
ofp.write(" \subitem %s%s\n" % (subitem, pages))
|
write(" \subitem %s%s\n" % (subitem, pages))
|
||||||
|
|
||||||
|
|
||||||
breakable_re = re.compile(r" \\item (.*) [(](.*)[)]((?:, \d+)+)")
|
breakable_re = re.compile(r" \\item (.*) [(](.*)[)]((?:, \d+)+)")
|
||||||
|
@ -55,27 +56,28 @@ def main():
|
||||||
else:
|
else:
|
||||||
fp = open(filename)
|
fp = open(filename)
|
||||||
ofp = StringIO.StringIO()
|
ofp = StringIO.StringIO()
|
||||||
item, subitem = None, None
|
|
||||||
entries = []
|
entries = []
|
||||||
|
match = breakable_re.match
|
||||||
|
write = ofp.write
|
||||||
while 1:
|
while 1:
|
||||||
line = fp.readline()
|
line = fp.readline()
|
||||||
if not line:
|
if not line:
|
||||||
break
|
break
|
||||||
m = breakable_re.match(line)
|
m = match(line)
|
||||||
if m:
|
if m:
|
||||||
entry = m.group(1, 2, 3)
|
entry = m.group(1, 2, 3)
|
||||||
if entries:
|
if entries and entries[-1][0] != entry[0]:
|
||||||
if entries[-1][0] != entry[0]:
|
dump_entries(write, entries)
|
||||||
dump_entries(ofp, entries)
|
|
||||||
entries = []
|
entries = []
|
||||||
entries.append(entry)
|
entries.append(entry)
|
||||||
elif entries:
|
elif entries:
|
||||||
dump_entries(ofp, entries)
|
dump_entries(write, entries)
|
||||||
entries = []
|
entries = []
|
||||||
ofp.write(line)
|
write(line)
|
||||||
else:
|
else:
|
||||||
pass
|
write(line)
|
||||||
ofp.write(line)
|
del write
|
||||||
|
del match
|
||||||
fp.close()
|
fp.close()
|
||||||
if outfile == "-":
|
if outfile == "-":
|
||||||
fp = sys.stdout
|
fp = sys.stdout
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue