Title (and refresh) can be None.

[bookmarks_db.git] / Robots / parse_html_beautifulsoup.py

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index db291f9fd46df8607709333dbaa304eaba00007e..f5e03b52e96808d7db6a21efd656d0541d3ed976 100644 (file)
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -87,17 +87,16 @@ def parse_html(filename, charset=None, log=None):
       # Lookup TITLE in the root
       title = root.title
 
-   if title is None:
-      title = ''
-   elif 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 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)
 
    meta = head.find(_find_contenttype, recursive=False)
    if meta: