X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_beautifulsoup.py;h=e1969f3250aa73d6e46e24883dd264f6df7ccd94;hb=b9c8d112b8d8d0f7c726ee7dd07a89b6569c90a1;hp=f796744a406812e92cbd208b8b132adf88f47643;hpb=c88cb7a75e7caf1d67466cfa107981d95115fa0c;p=bookmarks_db.git diff --git a/parse_html/bkmk_ph_beautifulsoup.py b/parse_html/bkmk_ph_beautifulsoup.py index f796744..e1969f3 100644 --- a/parse_html/bkmk_ph_beautifulsoup.py +++ b/parse_html/bkmk_ph_beautifulsoup.py @@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot. """ __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2007-2017 PhiloSoft Design" +__copyright__ = "Copyright (C) 2007-2023 PhiloSoft Design" __license__ = "GNU GPL" __all__ = ['parse_html'] @@ -16,9 +16,11 @@ from sgmllib import SGMLParser, SGMLParseError from BeautifulSoup import BeautifulSoup, CData from .bkmk_ph_util import HTMLParser -DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic +DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic # http://groups.google.com/group/beautifulsoup/browse_thread/thread/69093cb0d3a3cf63 + + class BadDeclParser(BeautifulSoup): def parse_declaration(self, i): """Treat a bogus SGML declaration as raw data. Treat a CDATA @@ -37,7 +39,10 @@ class BadDeclParser(BeautifulSoup): except SGMLParseError: # Could not parse the DOCTYPE declaration # Try to just skip the actual declaration - match = re.search(r']*?)>', self.rawdata[i:], re.MULTILINE|re.IGNORECASE) + match = re.search( + r']*?)>', self.rawdata[i:], + re.MULTILINE|re.IGNORECASE) # noqa: E227 + # missing whitespace around bitwise or shift operator if match: toHandle = self.rawdata[i:match.end()] else: @@ -53,13 +58,14 @@ def _parse_html(html_text, charset): except TypeError: return None + def parse_html(html_text, charset=None, log=None): root = _parse_html(html_text, charset) if root is None: return None _charset = root.originalEncoding - if _charset in ("ISO-8859-2", "windows-1252", "MacCyrillic"): # Replace default + if _charset in ("ISO-8859-2", "windows-1252", "MacCyrillic"): # Replace default _charset = DEFAULT_CHARSET root = _parse_html(html_text, _charset) if root is None: @@ -71,7 +77,7 @@ def parse_html(html_text, charset=None, log=None): head = html.head if head is None: - head = html # Some sites put TITLE in HTML without HEAD + head = html # Some sites put TITLE in HTML without HEAD title = head.title if (title is None) and (html is not head): @@ -101,7 +107,7 @@ def parse_html(html_text, charset=None, log=None): __charset = meta_content.lower().split('charset=')[1].split(';')[0] else: __charset = False - except IndexError: # No charset in the META Content-Type + except IndexError: # No charset in the META Content-Type meta_charset = False else: meta_charset = _charset == __charset @@ -134,17 +140,21 @@ def parse_html(html_text, charset=None, log=None): return None return HTMLParser(_charset, meta_charset, title, refresh, icon) + def _find_contenttype(Tag): return (Tag.name == "meta") and \ (Tag.get("http-equiv", '').lower() == "content-type") + def _find_charset(Tag): return (Tag.name == "meta") and Tag.get("charset", '') + def _find_refresh(Tag): return (Tag.name == "meta") and \ (Tag.get("http-equiv", '').lower() == "refresh") + def _find_icon(Tag): return (Tag.name == "link") and \ (Tag.get("rel", '').lower() in ('icon', 'shortcut icon'))