Misc. little fixes for tests that ryan added

jgraham · jgraham · commit 84313a8afe1a · 2007-10-12T23:45:56.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401055
diff --git a/src/html5lib/filters/formfiller.py b/src/html5lib/filters/formfiller.py
@@ -66,7 +66,7 @@ def __iter__(self):
 
                 elif name == "textarea":
                     field_type = "textarea"
-                    field_name = dict(reversed(token["data"]))["name"]
+                    field_name = dict((token["data"])[::-1])["name"]
 
                 elif name == "select":
                     field_type = "select"
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -809,7 +809,7 @@ def startTagCloseP(self, name, attributes):
 
     def startTagForm(self, name, attributes):
         if self.tree.formPointer:
-            self.parser.parseError("Unexpected start tag (form). Ignored.")
+            self.parser.parseError(u"unexpected-start-tag", {"name": "form"})
         else:
             if self.tree.elementInScope("p"):
                 self.endTagP("p")
@@ -1017,7 +1017,8 @@ def endTagBody(self, name):
         # XXX Need to take open <p> tags into account here. We shouldn't imply
         # </p> but we should not throw a parse error either. Specification is
         # likely to be updated.
-        if self.tree.openElements[1].name != "body":
+        if (len(self.tree.openElements) == 1 or
+            self.tree.openElements[1].name != "body"):
             # innerHTML case
             self.parser.parseError()
             return
@@ -1410,7 +1411,7 @@ def endTagCaption(self, name):
             if self.tree.openElements[-1].name != "caption":
                 self.parser.parseError("expected-one-end-tag-but-got-another",
                   {"gotName": "caption",
-                   "expectedNmae": self.tree.openElements[-1].name})
+                   "expectedName": self.tree.openElements[-1].name})
             while self.tree.openElements[-1].name != "caption":
                 self.tree.openElements.pop()
             self.tree.openElements.pop()
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -1,5 +1,7 @@
 import os
 import sys
+import traceback
+
 import StringIO
 import unittest
 from support import html5lib_test_files, TestData, convert, convertExpected
@@ -63,10 +65,16 @@ def runParserTest(self, innerHTML, input, expected, errors, treeClass):
         #XXX - move this out into the setup function
         #concatenate all consecutive character tokens into a single token
         p = html5parser.HTMLParser(tree = treeClass)
-        if innerHTML:
-            document = p.parseFragment(StringIO.StringIO(input), innerHTML)
-        else:
-            document = p.parse(StringIO.StringIO(input))
+        
+        try:
+            if innerHTML:
+                document = p.parseFragment(StringIO.StringIO(input), innerHTML)
+            else:
+                document = p.parse(StringIO.StringIO(input))
+        except:
+            errorMsg = "\n".join(["\n\nInput:", input, "\nExpected:", expected,
+                                  "\nTraceback:", traceback.format_exc()])
+            self.assertTrue(False, errorMsg)
         
         output = convertTreeDump(p.tree.testSerializer(document))
         output = attrlist.sub(sortattrs, output)
diff --git a/utils/package.py b/utils/package.py
@@ -28,8 +28,8 @@ def __init__(self, inDir, outDir, version="0", status=4, installDir="~"):
         self.outFiles = []
 
     def runall(self):
-        self.getFileList()
         self.copyTestData()
+        self.getFileList()
         self.copy()
         self.makeSetupFile()
         self.preprocess()
