return j
-def parse_html(filename, charset=None):
+def parse_html(filename, charset=None, log=None):
infile = open(filename, 'r')
try:
root = BadDeclParser(infile, fromEncoding=charset)
except TypeError:
+ if log: log("TypeError")
return None
finally:
infile.close()
try:
head = root.html.head
except AttributeError:
+ if log: log("No HTML in root or no HEAD in HTML")
return None
if head is None:
except AttributeError:
title = '' # no TITLE in HTML too
+ meta = head.find(_find_contenttype, recursive=False)
+ if meta:
+ try:
+ __charset = meta.get("content").lower().split('charset=')[1].split(';')[0]
+ except IndexError: # No charset in the META Content-Type
+ meta_charset = False
+ else:
+ meta_charset = _charset == __charset
+ else:
+ meta_charset = False
+
meta = head.find(_find_refresh, recursive=False)
if meta:
refresh = meta.get("content")
else:
icon = None
- return BSoupParser(_charset, _charset != charset, title, refresh, icon)
+ return BSoupParser(_charset, meta_charset, title, refresh, icon)
+
+def _find_contenttype(Tag):
+ return (Tag.name == "meta") and \
+ (Tag.get("http-equiv", '').lower() == "content-type")
def _find_refresh(Tag):
return (Tag.name == "meta") and \