Have a consistent API for errors where the format values are a dict.

gsnedders · gsnedders · commit 3640fe8a62d1 · 2013-04-09T22:50:50.000+01:00
Previously, they were sometimes a dict and sometimes needed wrapping
before using. This complicates the API for users, and having hacks
like this in our testsuite is just wonderful.
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -1572,7 +1572,7 @@ def processCharacters(self, token):
 
         def processEOF(self):
             self.parser.parseError("expected-named-closing-tag-but-got-eof", 
-                                   self.tree.openElements[-1].name)
+                                   {"name":self.tree.openElements[-1].name})
             self.tree.openElements.pop()
             self.parser.phase = self.parser.originalPhase
             return True
@@ -2392,7 +2392,7 @@ def processStartTag(self, token):
                 (token["name"] == "font" and
                  set(token["data"].keys()) & set(["color", "face", "size"]))):
                 self.parser.parseError("unexpected-html-element-in-foreign-content",
-                                       token["name"])
+                                       {"name": token["name"]})
                 while (self.tree.openElements[-1].namespace !=
                        self.tree.defaultNamespace and 
                        not self.parser.isHTMLIntegrationPoint(self.tree.openElements[-1]) and
@@ -2417,7 +2417,7 @@ def processEndTag(self, token):
             nodeIndex = len(self.tree.openElements) - 1
             node = self.tree.openElements[-1]
             if node.name != token["name"]:
-                self.parser.parseError("unexpected-end-tag", token["name"])
+                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
 
             while True:
                 if node.name.translate(asciiUpper2Lower) == token["name"]:
diff --git a/html5lib/tests/test_parser.py b/html5lib/tests/test_parser.py
@@ -59,9 +59,12 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,
     errorMsg = "\n".join(["\n\nInput:", input, "\nExpected:", expected,
                            "\nReceived:", output])
     assert expected == output, errorMsg
-    errStr = ["Line: %i Col: %i %s"%(line, col, 
-                                      constants.E[errorcode] % datavars if isinstance(datavars, dict) else (datavars,)) for
-              ((line,col), errorcode, datavars) in p.errors]
+
+    errStr = []
+    for (line, col), errorcode, datavars in p.errors:
+        assert isinstance(datavars, dict), "%s, %s" % (errorcode, repr(datavars))
+        errStr.append("Line: %i Col: %i %s" % (line, col, 
+                                               constants.E[errorcode] % datavars))
 
     errorMsg2 = "\n".join(["\n\nInput:", input,
                             "\nExpected errors (" + str(len(errors)) + "):\n" + "\n".join(errors),
