Add in select scope

James Graham · James Graham · commit 5770d05e557c · 2010-11-17T16:16:22.000+01:00
--HG--
extra : rebase_source : 5f1d51f4a4a368c83054d9d06aeacc7316267a15
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -2221,7 +2221,8 @@ def startTagSelect(self, token):
 
         def startTagInput(self, token):
             self.parser.parseError("unexpected-input-in-select")
-            if self.tree.elementInScope("select", variant="table"):
+            if self.tree.elementInScope("select", variant="select"):
+                assert self.parser.innerHTML
                 self.endTagSelect(impliedTagToken("select"))
                 return token
 
@@ -2253,7 +2254,7 @@ def endTagOptgroup(self, token):
                   {"name": "optgroup"})
 
         def endTagSelect(self, token):
-            if self.tree.elementInScope("select", variant="table"):
+            if self.tree.elementInScope("select", variant="select"):
                 node = self.tree.openElements.pop()
                 while node.name != "select":
                     node = self.tree.openElements.pop()
diff --git a/html5lib/treebuilders/_base.py b/html5lib/treebuilders/_base.py
@@ -159,19 +159,21 @@ def elementInScope(self, target, variant=None):
 
         listElementsMap = {
             None:scopingElements,
-            "button":scopingElements | set([(namespaces["html"], "button")]),
-            "list":scopingElements | set([(namespaces["html"], "ol"),
-                                          (namespaces["html"], "ul")]),
-            "table":set([(namespaces["html"], "html"),
-                         (namespaces["html"], "table")])
+            "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)
             }
-        listElements = listElementsMap[variant]
+        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 node.nameTuple in listElements:
+            elif ((not invert and node.nameTuple in listElements) or
+                  (invert and node.nameTuple not in listElements)):
                 return False
 
         assert False # We should never reach this point
