Browse Source

verify Fixed bottle's fortune test

Mike Smith 11 years ago
parent
commit
f6eb078084
2 changed files with 7 additions and 7 deletions
  1. 1 1
      bottle/app.py
  2. 6 6
      toolset/benchmark/fortune_html_parser.py

+ 1 - 1
bottle/app.py

@@ -92,7 +92,7 @@ def get_random_world_single_raw():
 @app.route("/fortune")
 @app.route("/fortune")
 def fortune_orm(db):
 def fortune_orm(db):
   fortunes=db.query(Fortune).all()
   fortunes=db.query(Fortune).all()
-  fortunes.append(Fortune(message="Additional fortune added at request time."))
+  fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
   fortunes=sorted(fortunes, key=attrgetter('message'))
   fortunes=sorted(fortunes, key=attrgetter('message'))
   return template('fortune-obj', fortunes=fortunes)
   return template('fortune-obj', fortunes=fortunes)
 
 

+ 6 - 6
toolset/benchmark/fortune_html_parser.py

@@ -27,28 +27,28 @@ class FortuneHTMLParser(HTMLParser):
     # """ is a valid escaping, but we are normalizing
     # """ is a valid escaping, but we are normalizing
     # it so that our final parse can just be checked for
     # it so that our final parse can just be checked for
     # equality.
     # equality.
-    if name == "34" or name == "x22":
+    if name == "34" or name == "034" or name == "x22":
       # Append our normalized entity reference to our body.
       # Append our normalized entity reference to our body.
       self.body.append(""")
       self.body.append(""")
     # "'" is a valid escaping of "-", but it is not
     # "'" is a valid escaping of "-", but it is not
     # required, so we normalize for equality checking.
     # required, so we normalize for equality checking.
-    if name == "39" or name == "x27":
+    if name == "39" or name == "039" or name == "x27":
       self.body.append("'")
       self.body.append("'")
     # Again, "+" is a valid escaping of the "+", but
     # Again, "+" is a valid escaping of the "+", but
     # it is not required, so we need to normalize for out
     # it is not required, so we need to normalize for out
     # final parse and equality check.
     # final parse and equality check.
-    if name == "43" or name == "x2B":
+    if name == "43" or name == "043" or name == "x2B":
       self.body.append("+")
       self.body.append("+")
     # Again, ">" is a valid escaping of ">", but we
     # Again, ">" is a valid escaping of ">", but we
     # need to normalize to ">" for equality checking.
     # need to normalize to ">" for equality checking.
-    if name == "62" or name == "x3E":
+    if name == "62" or name == "062" or name == "x3E":
       self.body.append(">")
       self.body.append(">")
     # Again, "&#60;" is a valid escaping of "<", but we
     # Again, "&#60;" is a valid escaping of "<", but we
     # need to normalize to "&lt;" for equality checking.
     # need to normalize to "&lt;" for equality checking.
-    if name == "60" or name == "x3C":
+    if name == "60" or name == "060" or name == "x3C":
       self.body.append("&lt;")
       self.body.append("&lt;")
     # Not sure why some are escaping '/'
     # Not sure why some are escaping '/'
-    if name == "47" or name == "x2F":
+    if name == "47" or name == "047" or name == "x2F":
       self.body.append("/")
       self.body.append("/")
 
 
   def handle_entityref(self, name):
   def handle_entityref(self, name):