mirror of
https://github.com/python/cpython.git
synced 2025-07-23 19:25:40 +00:00
Use string methods.
This commit is contained in:
parent
06912b7702
commit
071972e426
7 changed files with 18 additions and 23 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
__version__ = '$Revision$'
|
__version__ = '$Revision$'
|
||||||
|
|
||||||
import os
|
import os.path
|
||||||
import re
|
import re
|
||||||
import string
|
import string
|
||||||
import sys
|
import sys
|
||||||
|
@ -49,7 +49,7 @@ class Node:
|
||||||
|
|
||||||
def dump(self):
|
def dump(self):
|
||||||
return "%s\1%s###%s\n" \
|
return "%s\1%s###%s\n" \
|
||||||
% (string.join(self.links, "\1"),
|
% ("\1".join(self.links),
|
||||||
bang_join(self.text),
|
bang_join(self.text),
|
||||||
self.seqno)
|
self.seqno)
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ def format_html_letters(nodes, columns, group_symbol_nodes):
|
||||||
for letter, nodes in letter_groups:
|
for letter, nodes in letter_groups:
|
||||||
s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter)
|
s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter)
|
||||||
items.append(s)
|
items.append(s)
|
||||||
s = ["<hr><center>\n%s</center>\n" % string.join(items, " |\n")]
|
s = ["<hr><center>\n%s</center>\n" % " |\n".join(items)]
|
||||||
for letter, nodes in letter_groups:
|
for letter, nodes in letter_groups:
|
||||||
s.append(format_letter(letter))
|
s.append(format_letter(letter))
|
||||||
s.append(format_nodes(nodes, columns))
|
s.append(format_nodes(nodes, columns))
|
||||||
|
|
|
@ -19,13 +19,12 @@ isn't part of a group of similar items is not modified.
|
||||||
__version__ = '$Revision$'
|
__version__ = '$Revision$'
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import string
|
|
||||||
import StringIO
|
import StringIO
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def cmp_entries(e1, e2, lower=string.lower):
|
def cmp_entries(e1, e2):
|
||||||
return cmp(lower(e1[1]), lower(e2[1])) or cmp(e1, e2)
|
return cmp(e1[1].lower(), e2[1].lower()) or cmp(e1, e2)
|
||||||
|
|
||||||
|
|
||||||
def dump_entries(write, entries):
|
def dump_entries(write, entries):
|
||||||
|
|
|
@ -2,11 +2,10 @@
|
||||||
|
|
||||||
# This Python program sorts and reformats the table of keywords in ref2.tex
|
# This Python program sorts and reformats the table of keywords in ref2.tex
|
||||||
|
|
||||||
import string
|
|
||||||
l = []
|
l = []
|
||||||
try:
|
try:
|
||||||
while 1:
|
while 1:
|
||||||
l = l + string.split(raw_input())
|
l = l + raw_input().split()
|
||||||
except EOFError:
|
except EOFError:
|
||||||
pass
|
pass
|
||||||
l.sort()
|
l.sort()
|
||||||
|
@ -16,5 +15,5 @@ ncols = 5
|
||||||
nrows = (len(l)+ncols-1)/ncols
|
nrows = (len(l)+ncols-1)/ncols
|
||||||
for i in range(nrows):
|
for i in range(nrows):
|
||||||
for j in range(i, len(l), nrows):
|
for j in range(i, len(l), nrows):
|
||||||
print string.ljust(l[j], 10),
|
print l[j].ljust(10),
|
||||||
print
|
print
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
__version__ = '$Revision$'
|
__version__ = '$Revision$'
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import string
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +9,7 @@ import sys
|
||||||
try:
|
try:
|
||||||
p = os.path.dirname(__file__)
|
p = os.path.dirname(__file__)
|
||||||
except NameError:
|
except NameError:
|
||||||
p = sys.path[0]
|
p = os.path.dirname(sys.argv[0])
|
||||||
p = os.path.normpath(os.path.join(os.getcwd(), p, os.pardir,
|
p = os.path.normpath(os.path.join(os.getcwd(), p, os.pardir,
|
||||||
"api", "refcounts.dat"))
|
"api", "refcounts.dat"))
|
||||||
DEFAULT_PATH = p
|
DEFAULT_PATH = p
|
||||||
|
@ -27,11 +26,11 @@ def loadfile(fp):
|
||||||
line = fp.readline()
|
line = fp.readline()
|
||||||
if not line:
|
if not line:
|
||||||
break
|
break
|
||||||
line = string.strip(line)
|
line = line.strip()
|
||||||
if line[:1] in ("", "#"):
|
if line[:1] in ("", "#"):
|
||||||
# blank lines and comments
|
# blank lines and comments
|
||||||
continue
|
continue
|
||||||
parts = string.split(line, ":", 4)
|
parts = line.split(":", 4)
|
||||||
if len(parts) != 5:
|
if len(parts) != 5:
|
||||||
raise ValueError("Not enough fields in " + `line`)
|
raise ValueError("Not enough fields in " + `line`)
|
||||||
function, type, arg, refcount, comment = parts
|
function, type, arg, refcount, comment = parts
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
Usage: rewrite.py boilerplate.tex [VAR=value] ... <template >output
|
Usage: rewrite.py boilerplate.tex [VAR=value] ... <template >output
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import string
|
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
@ -12,9 +11,9 @@ def get_info(fp):
|
||||||
s = fp.read()
|
s = fp.read()
|
||||||
|
|
||||||
d = {}
|
d = {}
|
||||||
start = string.find(s, r"\date{")
|
start = s.find(r"\date{")
|
||||||
if start >= 0:
|
if start >= 0:
|
||||||
end = string.find(s, "}", start)
|
end = s.find("}", start)
|
||||||
date = s[start+6:end]
|
date = s[start+6:end]
|
||||||
if date == r"\today":
|
if date == r"\today":
|
||||||
date = time.strftime("%B %d, %Y", time.localtime(time.time()))
|
date = time.strftime("%B %d, %Y", time.localtime(time.time()))
|
||||||
|
@ -28,14 +27,14 @@ def main():
|
||||||
# yes, we actully need to load the replacement values
|
# yes, we actully need to load the replacement values
|
||||||
d = get_info(open(sys.argv[1]))
|
d = get_info(open(sys.argv[1]))
|
||||||
for arg in sys.argv[2:]:
|
for arg in sys.argv[2:]:
|
||||||
name, value = string.split(arg, "=", 1)
|
name, value = arg.split("=", 1)
|
||||||
d[name] = value
|
d[name] = value
|
||||||
start = 0
|
start = 0
|
||||||
while 1:
|
while 1:
|
||||||
start = string.find(s, "@", start)
|
start = s.find("@", start)
|
||||||
if start < 0:
|
if start < 0:
|
||||||
break
|
break
|
||||||
end = string.find(s, "@", start+1)
|
end = s.find("@", start+1)
|
||||||
name = s[start+1:end]
|
name = s[start+1:end]
|
||||||
if name:
|
if name:
|
||||||
value = d.get(name)
|
value = d.get(name)
|
||||||
|
|
|
@ -8,7 +8,6 @@ __version__ = '$Revision$'
|
||||||
|
|
||||||
|
|
||||||
import getopt
|
import getopt
|
||||||
import string
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,7 +70,7 @@ class Options:
|
||||||
self.args = self.args + args
|
self.args = self.args + args
|
||||||
for opt, val in opts:
|
for opt, val in opts:
|
||||||
if opt in ("-a", "--address"):
|
if opt in ("-a", "--address"):
|
||||||
val = string.strip(val)
|
val = val.strip()
|
||||||
if val:
|
if val:
|
||||||
val = "<address>\n%s\n</address>\n" % val
|
val = "<address>\n%s\n</address>\n" % val
|
||||||
self.variables["address"] = val
|
self.variables["address"] = val
|
||||||
|
|
|
@ -58,7 +58,7 @@ def parse_toc(fp, bigpart=None):
|
||||||
if m:
|
if m:
|
||||||
stype, snum, title, pageno = m.group(1, 2, 3, 4)
|
stype, snum, title, pageno = m.group(1, 2, 3, 4)
|
||||||
title = clean_title(title)
|
title = clean_title(title)
|
||||||
entry = (stype, snum, title, string.atoi(pageno), [])
|
entry = (stype, snum, title, int(pageno), [])
|
||||||
if stype == level:
|
if stype == level:
|
||||||
toc.append(entry)
|
toc.append(entry)
|
||||||
else:
|
else:
|
||||||
|
@ -99,7 +99,7 @@ def clean_title(title):
|
||||||
pos = start + 1
|
pos = start + 1
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
title = string.translate(title, title_trans, "{}")
|
title = title.translate(title_trans, "{}")
|
||||||
return title
|
return title
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue