X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_parser.py;h=997728f3b9ceba4072be9c7c872d02fda8ca763b;hb=2ec71bc7b14b39fc84806fd614631dc6f2b98b36;hp=b929721cedca3d68b84734bce4aa0bc4be1be09f;hpb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;p=bookmarks_db.git

diff --git a/bkmk_parser.py b/bkmk_parser.py
index b929721..997728f 100644
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -16,18 +16,18 @@ from m_lib.net.www.html import HTMLParser
 from bkmk_objects import Folder, Bookmark, Ruler
 
 
-DEBUG = os.environ.has_key("BKMK_DEBUG")
+DEBUG = "BKMK_DEBUG" in os.environ
 
 if DEBUG:
     def debug(note):
         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):
@@ -47,9 +47,9 @@ 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")
+            #if self.charset and default_encoding:
+            #    data = data.decode(self.charset, "replace").\
+            #        encode(default_encoding, "xmlcharrefreplace")
             self.accumulator += data
 
     # Mozilla - get charset