Test if m_lib is available.

[bookmarks_db.git] / Robots / parse_html.py

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index f50b01b415b5c6fd775fa41cb20325127ebf0469..23f53e49cae938701e02a6b39db4538080ef5ffb 100755 (executable)
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -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