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):
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
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):
folder = Folder(add_date, last_modified=last_modified)
self.current_object = folder
self.current_folder.append(folder)
- self.folder_stack.append(folder) # push new folder
+ self.folder_stack.append(folder) # push new folder
self.current_folder = folder
self.objects += 1
debug("End folder")
debug("Folder stack: %s" % dump_names(self.folder_stack))
if self.folder_stack:
- del self.folder_stack[-1] # pop last folder
+ del self.folder_stack[-1] # pop last folder
if self.folder_stack:
self.current_folder = self.folder_stack[-1]
else: