Recode entities before num. entities.

[bookmarks_db.git] / Robots / parse_html_beautifulsoup.py

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index 3d5c44a3f4464c699bd2b2f6090963d936944ae6..9b0faded06ab92cb951b844421555776690118ff 100644 (file)
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -1,7 +1,7 @@
 """
    HTML Parser using BeautifulSoup
 
-   Written by BroytMann. Copyright (C) 2007 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2007, 2008 PhiloSoft Design
 """
 
 import re
@@ -72,13 +72,13 @@ def parse_html(filename, charset=None):
    except AttributeError:
       title = '' # HEAD but no TITLE
 
-   if not title:
-      head = root.html # Some sites put TITLE in HTML outside of HEAD
+   if (not title) and (head is not root.html):
+      # Some sites put TITLE in HTML outside of HEAD
 
-   try:
-      title = head.title.string.encode(_charset)
-   except AttributeError:
-      title = '' # HEAD but no TITLE
+      try:
+         title = root.html.title.string.encode(_charset)
+      except AttributeError:
+         title = '' # no TITLE in HTML too
 
    meta = head.find(_find_refresh, recursive=False)
    if meta: