fixup! Implement InHeadNoscript context

Author: gsnedders

html5lib/constants.py

@@ -285,6 +285,10 @@
         "Unexpected end tag (%(name)s) before html.",
     "unexpected-inhead-noscript-tag":
         "Element %(name)s not allowed in a inhead-noscript context",
+    "eof-in-head-noscript":
+        "Unexpected end of file. Expected inhead-noscript content",
+    "char-in-head-noscript":
+        "Unexpected non-space character. Expected inhead-noscript content",
     "XXX-undefined-error":
         "Undefined error (this sucks and should be fixed)",
 }

html5lib/html5parser.py

@@ -827,6 +827,22 @@ def __init__(self, parser, tree):
             ])
             self.endTagHandler.default = self.endTagOther
 
+        def processEOF(self):
+            self.parser.parseError("eof-in-head-noscript")
+            self.anythingElse()
+            return True
+
+        def processComment(self, token):
+            return self.parser.phases["inHead"].processComment(token)
+
+        def processCharacters(self, token):
+            self.parser.parseError("char-in-head-noscript")
+            self.anythingElse()
+            return token
+
+        def processSpaceCharacters(self, token):
+            return self.parser.phases["inHead"].processSpaceCharacters(token)
+
         def startTagHtml(self, token):
             return self.parser.phases["inBody"].processStartTag(token)
 
@@ -837,23 +853,26 @@ def startTagHeadNoscript(self, token):
             self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
 
         def startTagOther(self, token):
-            return self.anythingElse(token)
+            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
+            self.anythingElse()
+            return token
 
         def endTagNoscript(self, token):
             node = self.parser.tree.openElements.pop()
             assert node.name == "noscript", "Expected noscript got %s" % node.name
             self.parser.phase = self.parser.phases["inHead"]
 
         def endTagBr(self, token):
-            return self.anythingElse(token)
+            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
+            self.anythingElse()
+            return token
 
         def endTagOther(self, token):
             self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
 
-        def anythingElse(self, token):
-            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
+        def anythingElse(self):
+            # Caller must raise parse error first!
             self.endTagNoscript(impliedTagToken("noscript"))
-            return token
 
     class AfterHeadPhase(Phase):
         def __init__(self, parser, tree):