X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=23f53e49cae938701e02a6b39db4538080ef5ffb;hb=a38eb2c9d04e866177c80cb961712ed3d4574f5e;hp=cc7655bfa950770d3f092ad7c32d387f2f65bd8b;hpb=349d6e0241d43e42a257d6019972402116236ee7;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index cc7655b..23f53e4 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -13,11 +13,11 @@ DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 parsers = []
 
 try:
-   import parse_html_etreetidy
+   import parse_html_html5
 except ImportError:
    pass
 else:
-   parsers.append(parse_html_etreetidy.parse_html)
+   parsers.append(parse_html_html5.parse_html)
 
 try:
    import parse_html_beautifulsoup
@@ -27,8 +27,12 @@ except ImportError:
 else:
    parsers.append(parse_html_beautifulsoup.parse_html)
 
-from parse_html_htmlparser import parse_html
-parsers.append(parse_html)
+try:
+   from parse_html_htmlparser import parse_html
+except ImportError:
+   pass
+else:
+    parsers.append(parse_html)
 
 
 import re
@@ -61,6 +65,9 @@ def recode_entities(title, charset):
 
 
 def parse_html(filename, charset=None, log=None):
+   if not parsers:
+       return None
+
    if charset:
       try:
          codecs.lookup(charset) # In case of unknown charset...
@@ -70,8 +77,9 @@ def parse_html(filename, charset=None, log=None):
    charsets = [universal_charset, DEFAULT_CHARSET]
    if charset:
       charset = charset.lower().replace("windows-", "cp")
-      if charset not in charsets:
-         charsets.insert(0, charset)
+      if charset in charsets:
+         charsets.remove(charset)
+      charsets.insert(0, charset)
 
    for p in parsers:
       parser = None