X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_beautifulsoup4.py;h=fbd54ff9cfd207c583d5119ba06c20faf23f9d4d;hb=e2c7ec4349db18acd4c8d0902b0a5ab2cffd5be7;hp=1ce543e828936284bc469f6037bf4f0a77ca14c4;hpb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;p=bookmarks_db.git diff --git a/parse_html/bkmk_ph_beautifulsoup4.py b/parse_html/bkmk_ph_beautifulsoup4.py index 1ce543e..fbd54ff 100644 --- a/parse_html/bkmk_ph_beautifulsoup4.py +++ b/parse_html/bkmk_ph_beautifulsoup4.py @@ -11,9 +11,10 @@ __license__ = "GNU GPL" __all__ = ['parse_html'] -import re from bs4 import BeautifulSoup + from .bkmk_ph_util import HTMLParser +from compat import string_type universal_charset = "utf-8" DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic @@ -55,8 +56,8 @@ def parse_html(html_text, charset=None, log=None): else: parts = [] for part in title: - if not isinstance(part, basestring): - part = unicode(part) + if not isinstance(part, string_type): + part = part.decode() parts.append(part.strip()) title = ''.join(parts)