|
|
@@ -4,7 +4,7 @@ from HTMLParser import HTMLParser
|
|
|
class FortuneHTMLParser(HTMLParser):
|
|
|
body = []
|
|
|
|
|
|
- valid = '<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr><tr><td>11</td><td><script>alert("This should not be displayed in a browser alert box.");</script></td></tr><tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr><tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr><tr><td>2</td><td>A computer scientist is someone who fixes things that aren't broken.</td></tr><tr><td>8</td><td>A list is only as strong as its weakest link. — Donald Knuth</td></tr><tr><td>0</td><td>Additional fortune added at request time.</td></tr><tr><td>3</td><td>After enough decimal places, nobody gives a damn.</td></tr><tr><td>7</td><td>Any program that runs right is obsolete.</td></tr><tr><td>10</td><td>Computers make very fast, very accurate mistakes.</td></tr><tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen</td></tr><tr><td>9</td><td>Feature: A bug with seniority.</td></tr><tr><td>1</td><td>fortune: No such file or directory</td></tr><tr><td>12</td><td>フレームワークのベンチマーク</td></tr></table></body></html>'
|
|
|
+ valid = '<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr><tr><td>11</td><td><script>alert("This should not be displayed in a browser alert box.");</script></td></tr><tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr><tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr><tr><td>2</td><td>A computer scientist is someone who fixes things that aren't broken.</td></tr><tr><td>8</td><td>A list is only as strong as its weakest link. — Donald Knuth</td></tr><tr><td>0</td><td>Additional fortune added at request time.</td></tr><tr><td>3</td><td>After enough decimal places, nobody gives a damn.</td></tr><tr><td>7</td><td>Any program that runs right is obsolete.</td></tr><tr><td>10</td><td>Computers make very fast, very accurate mistakes.</td></tr><tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen</td></tr><tr><td>9</td><td>Feature: A bug with seniority.</td></tr><tr><td>1</td><td>fortune: No such file or directory</td></tr><tr><td>12</td><td>フレームワークのベンチマーク</td></tr></table></body>'
|
|
|
|
|
|
# Is called when a doctype or other such tag is read in.
|
|
|
# For our purposes, we assume this is only going to be
|
|
|
@@ -76,7 +76,11 @@ class FortuneHTMLParser(HTMLParser):
|
|
|
# This is called every time a tag is closed. We append
|
|
|
# each one wrapped in "</" and ">".
|
|
|
def handle_endtag(self, tag):
|
|
|
- self.body.append("</{t}>".format(t=tag))
|
|
|
+ # Strictly speaking, a '</html>' is unnecessary, and
|
|
|
+ # some tests omit it; so we will omit it in our
|
|
|
+ # normalized version.
|
|
|
+ if tag != "html":
|
|
|
+ self.body.append("</{t}>".format(t=tag))
|
|
|
|
|
|
# Returns whether the HTML input parsed by this parser
|
|
|
# is valid against our known "fortune" spec.
|
Mike Smith