Select changes with added correctness. Set frameset-ok to False when stray <body> is enountered

James Graham · James Graham · commit b9fedaceb427 · 2010-11-17T18:45:24.000+01:00
--HG--
extra : rebase_source : 58d1d37ccbe80e7906c1be64b4bd8c50685a570e
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -1011,6 +1011,7 @@ def startTagBody(self, token):
                 or self.tree.openElements[1].name != "body"):
                 assert self.parser.innerHTML
             else:
+                self.parser.framesetOK = False
                 for attr, value in token["data"].iteritems():
                     if attr not in self.tree.openElements[1].attributes:
                         self.tree.openElements[1].attributes[attr] = value
@@ -2221,7 +2222,7 @@ def startTagSelect(self, token):
 
         def startTagInput(self, token):
             self.parser.parseError("unexpected-input-in-select")
-            if self.tree.elementInScope("select", variant="select"):
+            if not self.tree.elementInScope("select", variant="select"):
                 assert self.parser.innerHTML
                 self.endTagSelect(impliedTagToken("select"))
                 return token
diff --git a/html5lib/treebuilders/_base.py b/html5lib/treebuilders/_base.py
@@ -158,22 +158,22 @@ def elementInScope(self, target, variant=None):
         exactNode = hasattr(target, "nameTuple")
 
         listElementsMap = {
-            None:scopingElements,
+            None:(scopingElements, False),
             "button":(scopingElements | set([(namespaces["html"], "button")]), False),
             "list":(scopingElements | set([(namespaces["html"], "ol"),
                                            (namespaces["html"], "ul")]), False),
             "table":(set([(namespaces["html"], "html"),
                           (namespaces["html"], "table")]), False),
-            "select":(set(["optgroup", "option"]), True)
+            "select":(set([(namespaces["html"], "optgroup"), 
+                           (namespaces["html"], "option")]), True)
             }
         listElements, invert = listElementsMap[variant]
 
         for node in reversed(self.openElements):
             if (node.name == target and not exactNode or
                 node == target and exactNode):
                 return True
-            elif ((not invert and node.nameTuple in listElements) or
-                  (invert and node.nameTuple not in listElements)):
+            elif (invert ^ (node.nameTuple in listElements)):                
                 return False
 
         assert False # We should never reach this point
