propogate information about chardet and using meta to the tokenizer

jgraham · jgraham · commit 3ca6c915d39c · 2009-07-12T13:09:17.000+02:00
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -190,7 +190,8 @@ def parse(self, stream, encoding=None, parseMeta=True, useChardet=True):
         regardless of any BOM or later declaration (such as in a meta
         element)
         """
-        self._parse(stream, innerHTML=False, encoding=encoding)
+        self._parse(stream, innerHTML=False, encoding=encoding, 
+                    parseMeta=parseMeta, useChardet=useChardet)
         return self.tree.getDocument()
     
     def parseFragment(self, stream, container="div", encoding=None,
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
@@ -202,7 +202,6 @@ def openStream(self, source):
         return stream
 
     def detectEncoding(self, parseMeta=True, chardet=True):
-
         #First look for a BOM
         #This will also read past the BOM if present
         encoding = self.detectBOM()
diff --git a/src/html5lib/tokenizer.py b/src/html5lib/tokenizer.py
@@ -39,6 +39,7 @@ class HTMLTokenizer:
 
     def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
                  lowercaseElementName=True, lowercaseAttrName=True):
+
         self.stream = HTMLInputStream(stream, encoding, parseMeta, useChardet)
         
         #Perform case conversions?
