X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_beautifulsoup.py;h=0aad3dde72557abdb2f97edeea4d814151f388f6;hb=f6c7680eb82ae0db48ce4c17a9b259e159ef8bd8;hp=888f868818deaf4d93e30fab6e21957799af9bc7;hpb=968bbee3279fdea70161ed595146f11ec69c57ea;p=bookmarks_db.git diff --git a/parse_html/bkmk_ph_beautifulsoup.py b/parse_html/bkmk_ph_beautifulsoup.py index 888f868..0aad3dd 100644 --- a/parse_html/bkmk_ph_beautifulsoup.py +++ b/parse_html/bkmk_ph_beautifulsoup.py @@ -16,7 +16,7 @@ from sgmllib import SGMLParser, SGMLParseError from BeautifulSoup import BeautifulSoup, CData from .bkmk_ph_util import HTMLParser -from ..compat import string_type +from compat import string_type DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic @@ -62,6 +62,8 @@ def _parse_html(html_text, charset): def parse_html(html_text, charset=None, log=None): + if not html_text: + return None root = _parse_html(html_text, charset) if root is None: return None @@ -125,8 +127,8 @@ def parse_html(html_text, charset=None, log=None): if meta_content: meta_charset = _charset = meta_content.lower() - if title and (_charset or meta_charset): - title = title.encode(_charset or meta_charset) + #if title and (_charset or meta_charset): + # title = title.encode(_charset or meta_charset) meta = head.find(_find_refresh, recursive=False) if meta: