1.1 --- a/libxml2dom/macrolib/macrolib.py Sat Mar 17 19:45:57 2007 +0000
1.2 +++ b/libxml2dom/macrolib/macrolib.py Sat Mar 17 19:46:52 2007 +0000
1.3 @@ -501,14 +501,14 @@
1.4 libxml2mod.xmlCreateIntSubset(d, doctype.localName, doctype.publicId, doctype.systemId)
1.5 return d
1.6
1.7 -def parse(stream_or_string, html=0):
1.8 +def parse(stream_or_string, html=0, htmlencoding=None):
1.9 if hasattr(stream_or_string, "read"):
1.10 stream = stream_or_string
1.11 - return parseString(stream.read(), html)
1.12 + return parseString(stream.read(), html, htmlencoding)
1.13 else:
1.14 - return parseFile(stream_or_string, html)
1.15 + return parseFile(stream_or_string, html, htmlencoding)
1.16
1.17 -def parseFile(s, html=0):
1.18 +def parseFile(s, html=0, htmlencoding=None):
1.19 # NOTE: Switching off validation and remote DTD resolution.
1.20 if not html:
1.21 context = libxml2mod.xmlCreateFileParserCtxt(s)
1.22 @@ -518,9 +518,9 @@
1.23 libxml2mod.xmlParseDocument(context)
1.24 return libxml2mod.xmlParserGetDoc(context)
1.25 else:
1.26 - return libxml2mod.htmlReadFile(s, None, HTML_PARSE_NOERROR | HTML_PARSE_NOWARNING | HTML_PARSE_NONET)
1.27 + return libxml2mod.htmlReadFile(s, htmlencoding, HTML_PARSE_NOERROR | HTML_PARSE_NOWARNING | HTML_PARSE_NONET)
1.28
1.29 -def parseString(s, html=0):
1.30 +def parseString(s, html=0, htmlencoding=None):
1.31 # NOTE: Switching off validation and remote DTD resolution.
1.32 if not html:
1.33 context = libxml2mod.xmlCreateMemoryParserCtxt(s, len(s))
1.34 @@ -532,10 +532,10 @@
1.35 else:
1.36 # NOTE: URL given as None.
1.37 html_url = None
1.38 - return libxml2mod.htmlReadMemory(s, len(s), html_url, None,
1.39 + return libxml2mod.htmlReadMemory(s, len(s), html_url, htmlencoding,
1.40 HTML_PARSE_NOERROR | HTML_PARSE_NOWARNING | HTML_PARSE_NONET)
1.41
1.42 -def parseURI(uri, html=0):
1.43 +def parseURI(uri, html=0, htmlencoding=None):
1.44 # NOTE: Switching off validation and remote DTD resolution.
1.45 if not html:
1.46 context = libxml2mod.xmlCreateURLParserCtxt(uri, 0)