Fix handling of option

Author: James Graham

html5lib/html5parser.py

@@ -1538,9 +1538,10 @@ def endTagBr(self, token):
     def endTagOther(self, token):
         for node in self.tree.openElements[::-1]:
             if node.name == token["name"]:
-                self.tree.generateImpliedEndTags()
+                self.tree.generateImpliedEndTags(exclude=token["name"])
                 if self.tree.openElements[-1].name != token["name"]:
                     self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
+                print self.tree.openElements
                 while self.tree.openElements.pop() != node:
                     pass
                 break

html5lib/tests/support.py

@@ -23,8 +23,6 @@
 from html5lib import html5parser, treebuilders
 del base_path
 
-import simplejson
-
 #Build a dict of avaliable trees
 treeTypes = {"simpletree":treebuilders.getTreeBuilder("simpletree"),
              "DOM":treebuilders.getTreeBuilder("dom")}

html5lib/treebuilders/_base.py

@@ -321,7 +321,7 @@ def getTableMisnestedNodePosition(self):
     def generateImpliedEndTags(self, exclude=None):
         name = self.openElements[-1].name
         # XXX td, th and tr are not actually needed
-        if (name in frozenset(("dd", "dt", "li", "p", "td", "th", "tr"))
+        if (name in frozenset(("dd", "dt", "li", "option", "optgroup", "p", "rp", "rt"))
             and name != exclude):
             self.openElements.pop()
             # XXX This is not entirely what the specification says. We should