Get non-namespaced mode working.

gsnedders · gsnedders · commit 4e8e048e5448 · 2009-10-17T13:26:12.000+02:00
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
@@ -1,4 +1,3 @@
-import warnings
 from html5lib.constants import scopingElements, tableInsertModeElements, namespaces
 try:
     frozenset
@@ -115,7 +114,6 @@ def __init__(self, namespaceHTMLElements):
             self.defaultNamespace = "http://www.w3.org/1999/xhtml"
         else:
             self.defaultNamespace = None
-            warnings.warn(u"namespaceHTMLElements=False is currently rather broken, you probably don't want to use it")
         self.reset()
     
     def reset(self):
diff --git a/src/html5lib/treebuilders/etree_lxml.py b/src/html5lib/treebuilders/etree_lxml.py
@@ -304,8 +304,7 @@ def insertRoot(self, token):
                 docStr += ' PUBLIC "%s" "%s"'%(self.doctype.publicId or "",
                                                self.doctype.systemId or "")
             docStr += ">"
-        #TODO - this needs to work when elements are not put into the default ns
-        docStr += "<html xmlns='http://www.w3.org/1999/xhtml'></html>"
+        docStr += "<THIS_SHOULD_NEVER_APPEAR_PUBLICLY/>"
         
         try:
             root = etree.fromstring(docStr)
@@ -321,9 +320,17 @@ def insertRoot(self, token):
         self.document = self.documentClass()
         self.document._elementTree = root.getroottree()
         
-        #Add the root element to the internal child/open data structures
+        # Give the root element the right name
+        name = token["name"]
         namespace = token.get("namespace", None)
-        root_element = self.elementClass(token["name"], namespace)
+        if namespace is None:
+            etree_tag = name
+        else:
+            etree_tag = "{%s}%s"%(namespace, name)
+        root.tag = etree_tag
+        
+        #Add the root element to the internal child/open data structures
+        root_element = self.elementClass(name, namespace)
         root_element._element = root
         self.document._childNodes.append(root_element)
         self.openElements.append(root_element)
