X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=cbb45d612f9b33699b6f2d0bbe397b11a3562fe1;hb=f79d81fcd336e913bf0f42f0a6fbdb582de0f3e3;hp=23f53e49cae938701e02a6b39db4538080ef5ffb;hpb=1d46a18bfe213e25401908cc3c31c5ac66008572;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 23f53e4..cbb45d6 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -2,7 +2,7 @@
 """
    HTML Parsers wrapper
 
-   Written by Broytman. Copyright (C) 1997-2010 PhiloSoft Design
+   Written by Broytman. Copyright (C) 1997-2011 PhiloSoft Design
 """
 
 import codecs
@@ -13,19 +13,19 @@ DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 parsers = []
 
 try:
-   import parse_html_html5
+   import parse_html_beautifulsoup
+   parse_html_beautifulsoup.DEFAULT_CHARSET = DEFAULT_CHARSET
 except ImportError:
    pass
 else:
-   parsers.append(parse_html_html5.parse_html)
+   parsers.append(parse_html_beautifulsoup.parse_html)
 
 try:
-   import parse_html_beautifulsoup
-   parse_html_beautifulsoup.DEFAULT_CHARSET = DEFAULT_CHARSET
+   from parse_html_lxml import parse_html
 except ImportError:
    pass
 else:
-   parsers.append(parse_html_beautifulsoup.parse_html)
+    parsers.append(parse_html)
 
 try:
    from parse_html_htmlparser import parse_html
@@ -34,6 +34,20 @@ except ImportError:
 else:
     parsers.append(parse_html)
 
+try:
+   import parse_html_html5
+except ImportError:
+   pass
+else:
+   parsers.append(parse_html_html5.parse_html)
+
+# ElementTidy often segfaults
+#try:
+#   import parse_html_etreetidy
+#except ImportError:
+#   pass
+#else:
+#   parsers.append(parse_html_etreetidy.parse_html)
 
 import re
 from htmlentitydefs import name2codepoint
@@ -94,6 +108,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:
@@ -133,6 +150,14 @@ def parse_html(filename, charset=None, log=None):
       final_title = ' '.join([s for s in parts if s])
       if log and (final_title <> converted_title): log("   final title    : %s" % final_title)
       parser.title = final_title
+
+   icon = parser.icon
+   if isinstance(icon, unicode):
+       try:
+           parser.icon = icon.encode('ascii')
+       except UnicodeEncodeError:
+           if parser.charset:
+               parser.icon = icon.encode(parser.charset)
    return parser