Merge

jgraham · jgraham · commit b0bec7d438d9 · 2010-01-17T11:59:23.000+01:00
diff --git a/src/html5lib/tokenizer.py b/src/html5lib/tokenizer.py
@@ -907,7 +907,7 @@ def beforeAttributeValueState(self):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
               "expected-attribute-value-but-got-right-bracket"})
             self.emitCurrentToken()
-        elif data in (u"=", u"<"):
+        elif data in (u"=", u"<", u"`"):
             self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
               "equals-in-unquoted-attribute-value"})
             self.currentToken["data"][-1][1] += data
@@ -968,8 +968,8 @@ def attributeValueUnQuotedState(self):
               "eof-in-attribute-value-no-quotes"})
             self.emitCurrentToken()
         else:
-            self.currentToken["data"][-1][1] += data + self.stream.charsUntil( \
-              frozenset(("&", ">", "<", "=", "'", '"')) | spaceCharacters)
+            self.currentToken["data"][-1][1] += data + self.stream.charsUntil(
+              frozenset((u"&", u">", u'"', u"'", u"=", u"<", u"`")) | spaceCharacters)
         return True
 
     def afterAttributeValueState(self):
diff --git a/src/html5lib/treebuilders/__init__.py b/src/html5lib/treebuilders/__init__.py
@@ -73,6 +73,19 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
             import etree_lxml
             treeBuilderCache[treeType] = etree_lxml.TreeBuilder
         elif treeType == "etree":
+            # Come up with a sane default
+            if implementation == None:
+                try:
+                    import xml.etree.cElementTree as ET
+                except ImportError:
+                    try:
+                        import xml.etree.ElementTree as ET
+                    except ImportError:
+                        try:
+                            import cElementTree as ET
+                        except ImportError:
+                            import elementtree.ElementTree as ET
+                implementation = ET
             import etree
             # XXX: NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeBuilder
