Fixed encoding.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 88abdf5f9e6dd76a08e246a3b48eec83b09de374..a9567e22134fd70b9adcefe788c2b2bb3a45746f 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,18 +1,19 @@
 """
    Objects to represent bookmarks.html structure
 
-   Written by BroytMann, Mar 2000 - Sep 2007. Copyright (C) 2000-2007 PhiloSoft Design
+   Written by Oleg Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
+import os, cgi
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
-from UserList import UserList
 
-class Folder(UserList):
+class Folder(list):
    isFolder = 1
    isBookmark = 0
 
    def __init__(self, add_date=None, comment='', last_modified=None):
-      UserList.__init__(self)
+      super(Folder, self).__init__()
       self.comment = comment
       self.add_date = add_date
       self.last_modified = last_modified
@@ -27,7 +28,7 @@ class Folder(UserList):
             walker.start_folder(self, level)
 
       if not prune:
-         for object in self.data:
+         for object in self:
             if object.isFolder:
                object.walk_depth(walker, level+1)
             elif object.isBookmark:
@@ -43,13 +44,14 @@ class Bookmark:
    isBookmark = 1
 
    def __init__(self, href, add_date, last_visit=None, last_modified=None,
-         keyword=None, comment='', icon=None, charset=None):
+         keyword=None, comment='', icon_href=None, icon=None, charset=None):
       self.href = href
       self.add_date = add_date
       self.last_visit = last_visit
       self.last_modified = last_modified
       self.keyword = keyword
       self.comment = comment
+      self.icon_href = icon_href
       self.icon = icon
       self.charset = charset
 
@@ -161,3 +163,22 @@ def make_tree(linear):
       object.parent.append(object)
 
    return root_folder
+
+def break_tree(linear):
+   del linear[0]
+
+   for object in linear:
+      del object.parent
+
+
+def quote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      title = title.replace("'", "'")
+   return title
+
+def unquote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      from HTMLParser import HTMLParser
+      title = HTMLParser().unescape(title.replace("&", '&'))
+      title = title.replace("'", "'")
+   return title