X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_lxml.py;h=1fa47917deaf81fb6b40dbb413498e45dec7eadc;hb=5c36d7d49c7b00d5ef1054804fcd0bf7daaa834b;hp=222f11697340f32381f846ab55cf753ffa15444a;hpb=1249f2d538e9d679421d7bbb59dfac33fad537f4;p=bookmarks_db.git diff --git a/parse_html/bkmk_ph_lxml.py b/parse_html/bkmk_ph_lxml.py index 222f116..1fa4791 100644 --- a/parse_html/bkmk_ph_lxml.py +++ b/parse_html/bkmk_ph_lxml.py @@ -1,21 +1,22 @@ """HTML Parser using lxml.html This file is a part of Bookmarks database and Internet robot. + """ __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design" +__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design" __license__ = "GNU GPL" __all__ = ['parse_html'] -from lxml.html import parse +from lxml.html import fromtring from .bkmk_ph_util import HTMLParser -def parse_html(filename, charset=None, log=None): - html_tree = parse(filename) +def parse_html(html_text, charset=None, log=None): + html_tree = fromtring(html_text) if html_tree.getroot() is None: return None @@ -36,8 +37,8 @@ def parse_html(filename, charset=None, log=None): except IndexError: meta_charset = False elif m.get('charset', ''): - meta_charset = m.get('charset').lower() - break + meta_charset = m.get('charset').lower() + break else: meta_charset = False