mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-15 15:25:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

remove redundant backslashes; some cosnetics

Browse source
This commit is contained in:
Guido van Rossum 1995-03-04 22:28:49 +00:00
parent 7b5430f2e8
commit 1dba24eeca
2 changed files with 69 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

119
Lib/htmllib.py
View file

@ -62,7 +62,7 @@ class CollectingParser(HTMLParser):
def __init__(self): def __init__(self):
HTMLParser.__init__(self) HTMLParser.__init__(self)
self.savetext = None self.savetext = None
self.nextid = '' self.nextid = []
self.isindex = 0 self.isindex = 0
self.title = '' self.title = ''
self.inanchor = 0 self.inanchor = 0
@ -470,54 +470,54 @@ class NullStylesheet:
class X11Stylesheet(NullStylesheet): class X11Stylesheet(NullStylesheet):
stdfontset = [ \ stdfontset = [
'-*-helvetica-medium-r-normal-*-*-100-100-*-*-*-*-*', \ '-*-helvetica-medium-r-normal-*-*-100-100-*-*-*-*-*',
'-*-helvetica-medium-o-normal-*-*-100-100-*-*-*-*-*', \ '-*-helvetica-medium-o-normal-*-*-100-100-*-*-*-*-*',
'-*-helvetica-bold-r-normal-*-*-100-100-*-*-*-*-*', \ '-*-helvetica-bold-r-normal-*-*-100-100-*-*-*-*-*',
'-*-courier-medium-r-normal-*-*-100-100-*-*-*-*-*', \ '-*-courier-medium-r-normal-*-*-100-100-*-*-*-*-*',
] ]
h1fontset = [ \ h1fontset = [
'-*-helvetica-medium-r-normal-*-*-180-100-*-*-*-*-*', \ '-*-helvetica-medium-r-normal-*-*-180-100-*-*-*-*-*',
'-*-helvetica-medium-o-normal-*-*-180-100-*-*-*-*-*', \ '-*-helvetica-medium-o-normal-*-*-180-100-*-*-*-*-*',
'-*-helvetica-bold-r-normal-*-*-180-100-*-*-*-*-*', \ '-*-helvetica-bold-r-normal-*-*-180-100-*-*-*-*-*',
] ]
h2fontset = [ \ h2fontset = [
'-*-helvetica-medium-r-normal-*-*-140-100-*-*-*-*-*', \ '-*-helvetica-medium-r-normal-*-*-140-100-*-*-*-*-*',
'-*-helvetica-medium-o-normal-*-*-140-100-*-*-*-*-*', \ '-*-helvetica-medium-o-normal-*-*-140-100-*-*-*-*-*',
'-*-helvetica-bold-r-normal-*-*-140-100-*-*-*-*-*', \ '-*-helvetica-bold-r-normal-*-*-140-100-*-*-*-*-*',
] ]
h3fontset = [ \ h3fontset = [
'-*-helvetica-medium-r-normal-*-*-120-100-*-*-*-*-*', \ '-*-helvetica-medium-r-normal-*-*-120-100-*-*-*-*-*',
'-*-helvetica-medium-o-normal-*-*-120-100-*-*-*-*-*', \ '-*-helvetica-medium-o-normal-*-*-120-100-*-*-*-*-*',
'-*-helvetica-bold-r-normal-*-*-120-100-*-*-*-*-*', \ '-*-helvetica-bold-r-normal-*-*-120-100-*-*-*-*-*',
] ]
ddindent = 40 ddindent = 40
class MacStylesheet(NullStylesheet): class MacStylesheet(NullStylesheet):
stdfontset = [ \ stdfontset = [
('Geneva', 'p', 10), \ ('Geneva', 'p', 10),
('Geneva', 'i', 10), \ ('Geneva', 'i', 10),
('Geneva', 'b', 10), \ ('Geneva', 'b', 10),
('Monaco', 'p', 10), \ ('Monaco', 'p', 10),
] ]
h1fontset = [ \ h1fontset = [
('Geneva', 'p', 18), \ ('Geneva', 'p', 18),
('Geneva', 'i', 18), \ ('Geneva', 'i', 18),
('Geneva', 'b', 18), \ ('Geneva', 'b', 18),
('Monaco', 'p', 18), \ ('Monaco', 'p', 18),
] ]
h3fontset = [ \ h3fontset = [
('Geneva', 'p', 14), \ ('Geneva', 'p', 14),
('Geneva', 'i', 14), \ ('Geneva', 'i', 14),
('Geneva', 'b', 14), \ ('Geneva', 'b', 14),
('Monaco', 'p', 14), \ ('Monaco', 'p', 14),
] ]
h3fontset = [ \ h3fontset = [
('Geneva', 'p', 12), \ ('Geneva', 'p', 12),
('Geneva', 'i', 12), \ ('Geneva', 'i', 12),
('Geneva', 'b', 12), \ ('Geneva', 'b', 12),
('Monaco', 'p', 12), \ ('Monaco', 'p', 12),
] ]
@ -528,29 +528,29 @@ else:
class GLStylesheet(NullStylesheet): class GLStylesheet(NullStylesheet):
stdfontset = [ \ stdfontset = [
'Helvetica 10', \ 'Helvetica 10',
'Helvetica-Italic 10', \ 'Helvetica-Italic 10',
'Helvetica-Bold 10', \ 'Helvetica-Bold 10',
'Courier 10', \ 'Courier 10',
] ]
h1fontset = [ \ h1fontset = [
'Helvetica 18', \ 'Helvetica 18',
'Helvetica-Italic 18', \ 'Helvetica-Italic 18',
'Helvetica-Bold 18', \ 'Helvetica-Bold 18',
'Courier 18', \ 'Courier 18',
] ]
h2fontset = [ \ h2fontset = [
'Helvetica 14', \ 'Helvetica 14',
'Helvetica-Italic 14', \ 'Helvetica-Italic 14',
'Helvetica-Bold 14', \ 'Helvetica-Bold 14',
'Courier 14', \ 'Courier 14',
] ]
h3fontset = [ \ h3fontset = [
'Helvetica 12', \ 'Helvetica 12',
'Helvetica-Italic 12', \ 'Helvetica-Italic 12',
'Helvetica-Bold 12', \ 'Helvetica-Bold 12',
'Courier 12', \ 'Courier 12',
] ]
@ -595,8 +595,7 @@ def testStdwin():
if not b: if not b:
b = fmt.StdwinBackEnd(window, 1) b = fmt.StdwinBackEnd(window, 1)
f = fmt.BaseFormatter(b.d, b) f = fmt.BaseFormatter(b.d, b)
p = FormattingParser(f, \ p = FormattingParser(f, MacStylesheet)
MacStylesheet)
p.feed(data) p.feed(data)
p.close() p.close()
b.finish() b.finish()

19
Lib/sgmllib.py
View file

@ -14,8 +14,8 @@ import string
# Regular expressions used for parsing # Regular expressions used for parsing
incomplete = regex.compile( \ incomplete = regex.compile(
'<!-?\|</[a-zA-Z][a-zA-Z0-9]*[ \t\n]*\|</?\|' + \ '<!-?\|</[a-zA-Z][a-zA-Z0-9]*[ \t\n]*\|</?\|' +
'&#[a-zA-Z0-9]*\|&[a-zA-Z][a-zA-Z0-9]*\|&') '&#[a-zA-Z0-9]*\|&[a-zA-Z][a-zA-Z0-9]*\|&')
entityref = regex.compile('&[a-zA-Z][a-zA-Z0-9]*[;.]') entityref = regex.compile('&[a-zA-Z][a-zA-Z0-9]*[;.]')
charref = regex.compile('&#[a-zA-Z0-9]+;') charref = regex.compile('&#[a-zA-Z0-9]+;')
@ -59,7 +59,7 @@ class SGMLParser:
# Interface -- feed some data to the parser. Call this as # Interface -- feed some data to the parser. Call this as
# often as you want, with as little or as much text as you # often as you want, with as little or as much text as you
# want (may include '\n'). (This just saves the text, all the # want (may include '\n'). (This just saves the text, all the
# processing is done by process() or close().) # processing is done by goahead().)
def feed(self, data): def feed(self, data):
self.rawdata = self.rawdata + data self.rawdata = self.rawdata + data
self.goahead(0) self.goahead(0)
@ -172,9 +172,9 @@ class SGMLParser:
# Now parse the data between i+1 and j into a tag and attrs # Now parse the data between i+1 and j into a tag and attrs
attrs = [] attrs = []
tagfind = regex.compile('[a-zA-Z][a-zA-Z0-9]*') tagfind = regex.compile('[a-zA-Z][a-zA-Z0-9]*')
attrfind = regex.compile( \ attrfind = regex.compile(
'[ \t\n]+\([a-zA-Z][a-zA-Z0-9]*\)' + \ '[ \t\n]+\([a-zA-Z][a-zA-Z0-9]*\)' +
'\([ \t\n]*=[ \t\n]*' + \ '\([ \t\n]*=[ \t\n]*' +
'\(\'[^\']*\';\|"[^"]*"\|[-a-zA-Z0-9./:+*%?!()_#]+\)\)?') '\(\'[^\']*\';\|"[^"]*"\|[-a-zA-Z0-9./:+*%?!()_#]+\)\)?')
k = tagfind.match(rawdata, i+1) k = tagfind.match(rawdata, i+1)
if k < 0: if k < 0:
@ -196,7 +196,7 @@ class SGMLParser:
attrvalue = attrvalue[1:-1] attrvalue = attrvalue[1:-1]
else: else:
attrvalue = '' attrvalue = ''
attrs.append(string.lower(attrname), attrvalue) attrs.append((string.lower(attrname), attrvalue))
k = k + l k = k + l
j = j+1 j = j+1
try: try:
@ -253,7 +253,7 @@ class SGMLParser:
# Example -- handle entity reference, no need to override # Example -- handle entity reference, no need to override
def handle_entityref(self, name): def handle_entityref(self, name):
table = self.__class__.entitydefs table = self.entitydefs
name = string.lower(name) name = string.lower(name)
if table.has_key(name): if table.has_key(name):
self.handle_data(table[name]) self.handle_data(table[name])
@ -318,4 +318,5 @@ def test():
x.feed(line) x.feed(line)
#test() if __name__ == '__main__':
test()