Try parser in order until the first one finds a title.

[bookmarks_db.git] / Robots / parse_html.py

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 23f53e49cae938701e02a6b39db4538080ef5ffb..bc9a8d4950fc2ae430a111c423c78c3a5c5755b9 100755 (executable)
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -12,13 +12,6 @@ DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 
 parsers = []
 
-try:
-   import parse_html_html5
-except ImportError:
-   pass
-else:
-   parsers.append(parse_html_html5.parse_html)
-
 try:
    import parse_html_beautifulsoup
    parse_html_beautifulsoup.DEFAULT_CHARSET = DEFAULT_CHARSET
@@ -34,6 +27,13 @@ except ImportError:
 else:
     parsers.append(parse_html)
 
+try:
+   import parse_html_html5
+except ImportError:
+   pass
+else:
+   parsers.append(parse_html_html5.parse_html)
+
 
 import re
 from htmlentitydefs import name2codepoint
@@ -94,6 +94,9 @@ def parse_html(filename, charset=None, log=None):
       else:
          if log: log("Parser %s.%s failed, trying next one." % (p.__module__, p.__name__))
 
+   if not parser:
+       return None
+
    converted_title = title = parser.title
    if title and (not parser.charset):
       try: