X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_parse_html.py;h=2e7df1a2b90fde750d0d47aafcf073a11c60c3a5;hb=5c36d7d49c7b00d5ef1054804fcd0bf7daaa834b;hp=07fe32e3e7e6a658ec82f0123acff746a7ac0b01;hpb=9faa13f6f8199790cf01533e857c593520559649;p=bookmarks_db.git

diff --git a/parse_html/bkmk_parse_html.py b/parse_html/bkmk_parse_html.py
index 07fe32e..2e7df1a 100644
--- a/parse_html/bkmk_parse_html.py
+++ b/parse_html/bkmk_parse_html.py
@@ -12,10 +12,13 @@ __all__ = ['parse_html', 'parse_filename', 'universal_charset']
 
 
 import codecs
+import os
+import re
+from htmlentitydefs import name2codepoint
 
-universal_charset = "utf-8"
-DEFAULT_CHARSET = "cp1251"  # Stupid default for Russian Cyrillic
+from compat import unicode, unichr
 
+DEFAULT_CHARSET = "cp1251"  # Stupid default for Russian Cyrillic
 parsers = []
 
 try:
@@ -63,10 +66,8 @@ else:
 # else:
 #     parsers.append(bkmk_ph_etreetidy.parse_html)
 
-import re
-from htmlentitydefs import name2codepoint
-
-entity_re = re.compile("(&\w+;)")
+universal_charset = "utf-8"
+entity_re = re.compile("(&\\w+;)")
 num_entity_re = re.compile("(&#[0-9]+;)")
 
 
@@ -93,7 +94,6 @@ def recode_entities(title, charset):
     return ''.join(output)
 
 
-import os
 BKMK_DEBUG_HTML_PARSERS = os.environ.get("BKMK_DEBUG_HTML_PARSERS")
 
 
@@ -167,7 +167,7 @@ def parse_html(html_text, charset=None, log=None):
     converted_title = title = parser.title
     if title and (not parser.charset):
         try:
-            unicode(title, "ascii")
+            title.decode("ascii")
         except UnicodeDecodeError:
             parser.charset = DEFAULT_CHARSET
 
@@ -186,12 +186,19 @@ def parse_html(html_text, charset=None, log=None):
             if log: log("   title          : %s" % title)
             if parser.charset != universal_charset:
                 try:
-                    converted_title = unicode(title, parser.charset).encode(universal_charset)
+                    converted_title = title.decode(parser.charset).\
+                        encode(universal_charset)
                 except UnicodeError:
-                    if log: log("   incorrect conversion from %s, converting from %s" % (parser.charset, DEFAULT_CHARSET))
-                    converted_title = unicode(title, DEFAULT_CHARSET, "replace").encode(universal_charset, "replace")
+                    if log:
+                        log("   incorrect conversion from %s,"
+                            "converting from %s"
+                            % (parser.charset, DEFAULT_CHARSET))
+                    converted_title = \
+                        title.decode(DEFAULT_CHARSET, "replace").\
+                        encode(universal_charset, "replace")
                     parser.charset = DEFAULT_CHARSET
-            if log and (converted_title != title): log("   converted title: %s" % converted_title)
+            if log and (converted_title != title):
+                log("   converted title: %s" % converted_title)
         except LookupError:
             if log: log("   unknown charset: '%s'" % parser.charset)
     else:
@@ -201,7 +208,8 @@ def parse_html(html_text, charset=None, log=None):
         final_title = recode_entities(converted_title, universal_charset)
         parts = [s.strip() for s in final_title.replace('\r', '').split('\n')]
         final_title = ' '.join([s for s in parts if s])
-        if log and (final_title != converted_title): log("   final title    : %s" % final_title)
+        if log and (final_title != converted_title):
+            log("   final title    : %s" % final_title)
         parser.title = final_title
 
     icon = parser.icon