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

Skip to content

Commit 1dba24e

Browse files
gvanrossumgvanrossum
committed
remove redundant backslashes; some cosnetics
1 parent 7b5430f commit 1dba24e

2 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎Lib/htmllib.py‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CollectingParser(HTMLParser):
6262
def __init__(self):
6363
HTMLParser.__init__(self)
6464
self.savetext = None
65-
self.nextid = ''
65+
self.nextid = []
6666
self.isindex = 0
6767
self.title = ''
6868
self.inanchor = 0
@@ -470,54 +470,54 @@ class NullStylesheet:
470470

471471

472472
class X11Stylesheet(NullStylesheet):
473-
stdfontset = [ \
474-
'-*-helvetica-medium-r-normal-*-*-100-100-*-*-*-*-*', \
475-
'-*-helvetica-medium-o-normal-*-*-100-100-*-*-*-*-*', \
476-
'-*-helvetica-bold-r-normal-*-*-100-100-*-*-*-*-*', \
477-
'-*-courier-medium-r-normal-*-*-100-100-*-*-*-*-*', \
473+
stdfontset = [
474+
'-*-helvetica-medium-r-normal-*-*-100-100-*-*-*-*-*',
475+
'-*-helvetica-medium-o-normal-*-*-100-100-*-*-*-*-*',
476+
'-*-helvetica-bold-r-normal-*-*-100-100-*-*-*-*-*',
477+
'-*-courier-medium-r-normal-*-*-100-100-*-*-*-*-*',
478478
]
479-
h1fontset = [ \
480-
'-*-helvetica-medium-r-normal-*-*-180-100-*-*-*-*-*', \
481-
'-*-helvetica-medium-o-normal-*-*-180-100-*-*-*-*-*', \
482-
'-*-helvetica-bold-r-normal-*-*-180-100-*-*-*-*-*', \
479+
h1fontset = [
480+
'-*-helvetica-medium-r-normal-*-*-180-100-*-*-*-*-*',
481+
'-*-helvetica-medium-o-normal-*-*-180-100-*-*-*-*-*',
482+
'-*-helvetica-bold-r-normal-*-*-180-100-*-*-*-*-*',
483483
]
484-
h2fontset = [ \
485-
'-*-helvetica-medium-r-normal-*-*-140-100-*-*-*-*-*', \
486-
'-*-helvetica-medium-o-normal-*-*-140-100-*-*-*-*-*', \
487-
'-*-helvetica-bold-r-normal-*-*-140-100-*-*-*-*-*', \
484+
h2fontset = [
485+
'-*-helvetica-medium-r-normal-*-*-140-100-*-*-*-*-*',
486+
'-*-helvetica-medium-o-normal-*-*-140-100-*-*-*-*-*',
487+
'-*-helvetica-bold-r-normal-*-*-140-100-*-*-*-*-*',
488488
]
489-
h3fontset = [ \
490-
'-*-helvetica-medium-r-normal-*-*-120-100-*-*-*-*-*', \
491-
'-*-helvetica-medium-o-normal-*-*-120-100-*-*-*-*-*', \
492-
'-*-helvetica-bold-r-normal-*-*-120-100-*-*-*-*-*', \
489+
h3fontset = [
490+
'-*-helvetica-medium-r-normal-*-*-120-100-*-*-*-*-*',
491+
'-*-helvetica-medium-o-normal-*-*-120-100-*-*-*-*-*',
492+
'-*-helvetica-bold-r-normal-*-*-120-100-*-*-*-*-*',
493493
]
494494
ddindent = 40
495495

496496

497497
class MacStylesheet(NullStylesheet):
498-
stdfontset = [ \
499-
('Geneva', 'p', 10), \
500-
('Geneva', 'i', 10), \
501-
('Geneva', 'b', 10), \
502-
('Monaco', 'p', 10), \
498+
stdfontset = [
499+
('Geneva', 'p', 10),
500+
('Geneva', 'i', 10),
501+
('Geneva', 'b', 10),
502+
('Monaco', 'p', 10),
503503
]
504-
h1fontset = [ \
505-
('Geneva', 'p', 18), \
506-
('Geneva', 'i', 18), \
507-
('Geneva', 'b', 18), \
508-
('Monaco', 'p', 18), \
504+
h1fontset = [
505+
('Geneva', 'p', 18),
506+
('Geneva', 'i', 18),
507+
('Geneva', 'b', 18),
508+
('Monaco', 'p', 18),
509509
]
510-
h3fontset = [ \
511-
('Geneva', 'p', 14), \
512-
('Geneva', 'i', 14), \
513-
('Geneva', 'b', 14), \
514-
('Monaco', 'p', 14), \
510+
h3fontset = [
511+
('Geneva', 'p', 14),
512+
('Geneva', 'i', 14),
513+
('Geneva', 'b', 14),
514+
('Monaco', 'p', 14),
515515
]
516-
h3fontset = [ \
517-
('Geneva', 'p', 12), \
518-
('Geneva', 'i', 12), \
519-
('Geneva', 'b', 12), \
520-
('Monaco', 'p', 12), \
516+
h3fontset = [
517+
('Geneva', 'p', 12),
518+
('Geneva', 'i', 12),
519+
('Geneva', 'b', 12),
520+
('Monaco', 'p', 12),
521521
]
522522

523523

@@ -528,29 +528,29 @@ class MacStylesheet(NullStylesheet):
528528

529529

530530
class GLStylesheet(NullStylesheet):
531-
stdfontset = [ \
532-
'Helvetica 10', \
533-
'Helvetica-Italic 10', \
534-
'Helvetica-Bold 10', \
535-
'Courier 10', \
531+
stdfontset = [
532+
'Helvetica 10',
533+
'Helvetica-Italic 10',
534+
'Helvetica-Bold 10',
535+
'Courier 10',
536536
]
537-
h1fontset = [ \
538-
'Helvetica 18', \
539-
'Helvetica-Italic 18', \
540-
'Helvetica-Bold 18', \
541-
'Courier 18', \
537+
h1fontset = [
538+
'Helvetica 18',
539+
'Helvetica-Italic 18',
540+
'Helvetica-Bold 18',
541+
'Courier 18',
542542
]
543-
h2fontset = [ \
544-
'Helvetica 14', \
545-
'Helvetica-Italic 14', \
546-
'Helvetica-Bold 14', \
547-
'Courier 14', \
543+
h2fontset = [
544+
'Helvetica 14',
545+
'Helvetica-Italic 14',
546+
'Helvetica-Bold 14',
547+
'Courier 14',
548548
]
549-
h3fontset = [ \
550-
'Helvetica 12', \
551-
'Helvetica-Italic 12', \
552-
'Helvetica-Bold 12', \
553-
'Courier 12', \
549+
h3fontset = [
550+
'Helvetica 12',
551+
'Helvetica-Italic 12',
552+
'Helvetica-Bold 12',
553+
'Courier 12',
554554
]
555555

556556

@@ -595,8 +595,7 @@ def testStdwin():
595595
if not b:
596596
b = fmt.StdwinBackEnd(window, 1)
597597
f = fmt.BaseFormatter(b.d, b)
598-
p = FormattingParser(f, \
599-
MacStylesheet)
598+
p = FormattingParser(f, MacStylesheet)
600599
p.feed(data)
601600
p.close()
602601
b.finish()

‎Lib/sgmllib.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
# Regular expressions used for parsing
1616

17-
incomplete = regex.compile( \
18-
'<!-?\|</[a-zA-Z][a-zA-Z0-9]*[ \t\n]*\|</?\|' + \
17+
incomplete = regex.compile(
18+
'<!-?\|</[a-zA-Z][a-zA-Z0-9]*[ \t\n]*\|</?\|' +
1919
'&#[a-zA-Z0-9]*\|&[a-zA-Z][a-zA-Z0-9]*\|&')
2020
entityref = regex.compile('&[a-zA-Z][a-zA-Z0-9]*[;.]')
2121
charref = regex.compile('&#[a-zA-Z0-9]+;')
@@ -59,7 +59,7 @@ def setliteral(self, *args):
5959
# Interface -- feed some data to the parser. Call this as
6060
# often as you want, with as little or as much text as you
6161
# want (may include '\n'). (This just saves the text, all the
62-
# processing is done by process() or close().)
62+
# processing is done by goahead().)
6363
def feed(self, data):
6464
self.rawdata = self.rawdata + data
6565
self.goahead(0)
@@ -172,9 +172,9 @@ def parse_starttag(self, i):
172172
# Now parse the data between i+1 and j into a tag and attrs
173173
attrs = []
174174
tagfind = regex.compile('[a-zA-Z][a-zA-Z0-9]*')
175-
attrfind = regex.compile( \
176-
'[ \t\n]+\([a-zA-Z][a-zA-Z0-9]*\)' + \
177-
'\([ \t\n]*=[ \t\n]*' + \
175+
attrfind = regex.compile(
176+
'[ \t\n]+\([a-zA-Z][a-zA-Z0-9]*\)' +
177+
'\([ \t\n]*=[ \t\n]*' +
178178
'\(\'[^\']*\';\|"[^"]*"\|[-a-zA-Z0-9./:+*%?!()_#]+\)\)?')
179179
k = tagfind.match(rawdata, i+1)
180180
if k < 0:
@@ -196,7 +196,7 @@ def parse_starttag(self, i):
196196
attrvalue = attrvalue[1:-1]
197197
else:
198198
attrvalue = ''
199-
attrs.append(string.lower(attrname), attrvalue)
199+
attrs.append((string.lower(attrname), attrvalue))
200200
k = k + l
201201
j = j+1
202202
try:
@@ -253,7 +253,7 @@ def handle_charref(self, name):
253253

254254
# Example -- handle entity reference, no need to override
255255
def handle_entityref(self, name):
256-
table = self.__class__.entitydefs
256+
table = self.entitydefs
257257
name = string.lower(name)
258258
if table.has_key(name):
259259
self.handle_data(table[name])
@@ -318,4 +318,5 @@ def test():
318318
x.feed(line)
319319

320320

321-
#test()
321+
if __name__ == '__main__':
322+
test()

0 commit comments

Comments
 (0)