Retrieve and store icon.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 231fb2f4e6482b6e2312d928eacc832cc97baf33..584b87f56af1d01188ab7d0c6557c373e820ea48 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,21 +1,19 @@
 """
    Objects to represent bookmarks.html structure
 
-   Written by BroytMann, Mar 2000 - Aug 2004. Copyright (C) 2000-2004 PhiloSoft Design
+   Written by Oleg BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
 """
 
 
-from UserList import UserList
-
-class Folder(UserList):
+class Folder(list):
    isFolder = 1
    isBookmark = 0
 
-   def __init__(self, add_date = None, comment = ''):
-      UserList.__init__(self)
+   def __init__(self, add_date=None, comment='', last_modified=None):
+      super(Folder, self).__init__()
       self.comment = comment
       self.add_date = add_date
-
+      self.last_modified = last_modified
 
    def walk_depth(self, walker, level=0):
       if hasattr(self, "header"): # root folder
@@ -27,7 +25,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 +41,15 @@ class Bookmark:
    isBookmark = 1
 
    def __init__(self, href, add_date, last_visit=None, last_modified=None,
-         keyword=None, comment = ''):
-      self.comment = comment
+         keyword=None, comment='', 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 = icon
+      self.charset = charset
 
 
 class Ruler: