except SGMLParseError:
# Could not parse the DOCTYPE declaration
# Try to just skip the actual declaration
- match = re.search(r'<!DOCTYPE([^>]*?)>', self.rawdata[i:], re.MULTILINE)
+ match = re.search(r'<!DOCTYPE([^>]*?)>', self.rawdata[i:], re.MULTILINE|re.IGNORECASE)
if match:
toHandle = self.rawdata[i:match.end()]
else:
return j
-def parse_html(filename, charset=None, log=None):
+def _parse_html(filename, charset):
infile = open(filename, 'r')
try:
- root = BadDeclParser(infile, fromEncoding=charset)
+ return BadDeclParser(infile, fromEncoding=charset)
except TypeError:
- if log: log("TypeError")
return None
finally:
infile.close()
- try:
- head = root.html.head
- except AttributeError:
- if log: log("No HTML in root or no HEAD in HTML")
+def parse_html(filename, charset=None, log=None):
+ root = _parse_html(filename, charset)
+ if root is None:
return None
- if head is None:
- head = root.html # Some sites put TITLE in HTML without HEAD
-
_charset = root.originalEncoding
- if _charset == "windows-1252": # Replace default
+ if _charset in ("ISO-8859-2", "windows-1252", "MacCyrillic"): # Replace default
_charset = DEFAULT_CHARSET
+ root = _parse_html(filename, _charset)
+ if root is None:
+ return None
- try:
- title = head.title.string.encode(_charset)
- except AttributeError:
- title = '' # HEAD but no TITLE
+ html = root.html
+ if html is None:
+ html = root
- if (not title) and (head is not root.html):
+ head = html.head
+ if head is None:
+ head = html # Some sites put TITLE in HTML without HEAD
+
+ title = head.title
+ if (title is None) and (html is not head):
# Some sites put TITLE in HTML outside of HEAD
+ title = html.title
- try:
- title = root.html.title.string.encode(_charset)
- except AttributeError:
- title = '' # no TITLE in HTML too
+ if title is 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)
meta = head.find(_find_contenttype, recursive=False)
if meta: