X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=bkmk_parser.py;h=42c0712d79b9bf2f8602d427f7a79b9f8bf0e262;hb=62ab6d5ee349ff88ed4995735711e1e3de904302;hp=00cfcd4c4ce298efc4d4da643b188b391230f325;hpb=c2ea4e82718b903aa123dd77490f36657383b0ca;p=bookmarks_db.git

diff --git a/bkmk_parser.py b/bkmk_parser.py
index 00cfcd4..42c0712 100644
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -23,11 +23,11 @@ if DEBUG:
         print(note)
 
     def dump_names(folder_stack):
-        l = []
+        _l = []
         for object in folder_stack:
             if object.isFolder:
-                l.append(object.name)
-        return "'%s'" % "' '".join(l)
+                _l.append(object.name)
+        return "'%s'" % "' '".join(_l)
 
 else:
     def debug(note):
@@ -48,7 +48,8 @@ class BkmkParser(HTMLParser):
     def handle_data(self, data):
         if data:
             if self.charset and default_encoding:
-                data = unicode(data, self.charset, "replace").encode(default_encoding, "xmlcharrefreplace")
+                data = data.decode(self.charset, "replace").\
+                    encode(default_encoding, "xmlcharrefreplace")
             self.accumulator += data
 
     # Mozilla - get charset
@@ -72,7 +73,8 @@ class BkmkParser(HTMLParser):
 
     def start_title(self, attrs):
         if default_encoding:
-            self.accumulator += '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=%s">\n' % default_encoding
+            self.accumulator += '<META HTTP-EQUIV="Content-Type" '
+            'CONTENT="text/html; charset=%s">\n' % default_encoding
         self.accumulator += "<TITLE>"
 
     def end_title(self):