X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parse_html%2Fbkmk_ph_lxml.py;h=9cd29e484068ed90c45eac906ed2c74f15bbd1bf;hb=917353d7c874075d3709f9295dc231d8894e61a4;hp=b14be408571ba53e0cfa5f60997394658ad2061b;hpb=80054d3bdcbde67d3b941e0b69b55ca4998f4673;p=bookmarks_db.git

diff --git a/parse_html/bkmk_ph_lxml.py b/parse_html/bkmk_ph_lxml.py
index b14be40..9cd29e4 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 <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2014 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
@@ -35,6 +36,9 @@ def parse_html(filename, charset=None, log=None):
                     break
                 except IndexError:
                     meta_charset = False
+        elif m.get('charset', ''):
+           meta_charset = m.get('charset').lower()
+           break
     else:
         meta_charset = False