X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_beautifulsoup.py;h=ac880cc6b7c197eab772d056e2d210eb5fabc520;hb=dd8d2bd3a0f9bf4e09f58d7289437cf43350f373;hp=f2f042e33b18aae1303f5fdbfa5f365f7aeeca78;hpb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;p=bookmarks_db.git

diff --git a/parse_html/bkmk_ph_beautifulsoup.py b/parse_html/bkmk_ph_beautifulsoup.py
index f2f042e..ac880cc 100644
--- a/parse_html/bkmk_ph_beautifulsoup.py
+++ b/parse_html/bkmk_ph_beautifulsoup.py
@@ -14,7 +14,9 @@ __all__ = ['parse_html']
 import re
 from sgmllib import SGMLParser, SGMLParseError
 from BeautifulSoup import BeautifulSoup, CData
+
 from .bkmk_ph_util import HTMLParser
+from compat import string_type
 
 DEFAULT_CHARSET = "cp1251"  # Stupid default for Russian Cyrillic
 
@@ -95,8 +97,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)
 
@@ -123,8 +125,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: