X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_parse_html.py;h=7764303a4e754715a86a3a12e5d0b48d1d5acb8c;hb=d1698b573f01316df3dfa05ff5dfa4c064728f33;hp=ddfad27bf378daabc202e23ea5807005d92fb671;hpb=e146ac995fdf0f2d4911908ba7ff0230cb182054;p=bookmarks_db.git diff --git a/parse_html/bkmk_parse_html.py b/parse_html/bkmk_parse_html.py index ddfad27..7764303 100644 --- a/parse_html/bkmk_parse_html.py +++ b/parse_html/bkmk_parse_html.py @@ -101,7 +101,7 @@ BKMK_DEBUG_HTML_PARSERS = os.environ.get("BKMK_DEBUG_HTML_PARSERS") def parse_html(html_text, charset=None, log=None): - if not parsers: + if not html_text or not parsers: return None if charset: @@ -168,7 +168,7 @@ def parse_html(html_text, charset=None, log=None): # parser.charset = 'ascii' converted_title = title = parser.title - if title and (not parser.charset): + if title and isinstance(title, bytes) and (not parser.charset): try: title.decode("ascii") except UnicodeDecodeError: @@ -226,7 +226,7 @@ def parse_html(html_text, charset=None, log=None): def parse_filename(filename, charset=None, log=None): - fp = open(filename, 'r') + fp = open(filename, 'rt') try: parser = parse_html(fp.read(), charset=charset, log=log) finally: