X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_parser.py;h=d4b6a2f32e05d6a8c3676f1415afa7ef1f441dfd;hb=640a29c4011d07346413cf75f758e3d721d36d74;hp=90b33b37a711a415e2611776f3646ae721318250;hpb=1e2f258f40c74803df6746e7b6041776ba715f4b;p=bookmarks_db.git diff --git a/bkmk_parser.py b/bkmk_parser.py index 90b33b3..d4b6a2f 100644 --- a/bkmk_parser.py +++ b/bkmk_parser.py @@ -13,9 +13,10 @@ __license__ = "GNU GPL" __all__ = ['BkmkParser'] -import sys, os +import os +from m_lib.defenc import default_encoding from m_lib.net.www.html import HTMLParser -from bkmk_objects import DEFAULT_CHARSET, Folder, Bookmark, Ruler +from bkmk_objects import Folder, Bookmark, Ruler DEBUG = os.environ.has_key("BKMK_DEBUG") @@ -49,8 +50,8 @@ class BkmkParser(HTMLParser): def handle_data(self, data): if data: - if self.charset and DEFAULT_CHARSET: - data = unicode(data, self.charset, "replace").encode(DEFAULT_CHARSET, "xmlcharrefreplace") + if self.charset and default_encoding: + data = unicode(data, self.charset, "replace").encode(default_encoding, "xmlcharrefreplace") self.accumulator += data # Mozilla - get charset @@ -73,8 +74,8 @@ class BkmkParser(HTMLParser): pass def start_title(self, attrs): - if DEFAULT_CHARSET: - self.accumulator += '\n' % DEFAULT_CHARSET + if default_encoding: + self.accumulator += '\n' % default_encoding self.accumulator += "