X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html_beautifulsoup.py;h=e03dfce99faa55b980e21a75e38249790d50c0a7;hb=52092194ea42dcece57ed93c2a2875cd2907564e;hp=47ecbaf459f367a9a80d535af1add172709dcf0d;hpb=0e76f1851882b99da63a7c8a9e4cdf0c4a48657f;p=bookmarks_db.git

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index 47ecbaf..e03dfce 100644
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -1,23 +1,13 @@
 """
    HTML Parser using BeautifulSoup
 
-   Written by Broytman. Copyright (C) 2007, 2008 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2007-2010 PhiloSoft Design
 """
 
 import re
 from sgmllib import SGMLParser, SGMLParseError
-from HTMLParser import HTMLParser
 from BeautifulSoup import BeautifulSoup, CData
-
-
-class BSoupParser(HTMLParser):
-   def __init__(self, charset, meta, title, refresh, icon):
-      object.__init__(self)
-      self.charset = charset
-      self.meta_charset = meta
-      self.title = title
-      self.refresh = refresh
-      self.icon = icon
+from parse_html_util import HTMLParser
 
 
 # http://groups.google.com/group/beautifulsoup/browse_thread/thread/69093cb0d3a3cf63
@@ -87,21 +77,27 @@ def parse_html(filename, charset=None, log=None):
       # Lookup TITLE in the root
       title = root.title
 
-   if title is not None:
-      if title.string:
-         title = title.string.encode(_charset)
-      else:
-         parts = []
-         for part in title:
-            if not isinstance(part, basestring):
-               part = unicode(part)
-            parts.append(part.strip())
-         title = ''.join(parts).encode(_charset)
+   if title is None:
+      return None
+
+   if title.string:
+      title = title.string
+   else:
+      parts = []
+      for part in title:
+         if not isinstance(part, basestring):
+            part = unicode(part)
+         parts.append(part.strip())
+      title = ''.join(parts)
 
    meta = head.find(_find_contenttype, recursive=False)
    if meta:
       try:
-         __charset = meta.get("content").lower().split('charset=')[1].split(';')[0]
+         meta_content = meta.get("content")
+         if meta_content:
+             __charset = meta_content.lower().split('charset=')[1].split(';')[0]
+         else:
+             __charset = False
       except IndexError: # No charset in the META Content-Type
          meta_charset = False
       else:
@@ -109,6 +105,9 @@ def parse_html(filename, charset=None, log=None):
    else:
       meta_charset = False
 
+   if _charset or meta_charset:
+      title = title.encode(_charset or meta_charset)
+
    meta = head.find(_find_refresh, recursive=False)
    if meta:
       refresh = meta.get("content")
@@ -121,7 +120,7 @@ def parse_html(filename, charset=None, log=None):
    else:
       icon = None
 
-   return BSoupParser(_charset, meta_charset, title, refresh, icon)
+   return HTMLParser(_charset, meta_charset, title, refresh, icon)
 
 def _find_contenttype(Tag):
    return (Tag.name == "meta") and \