Renamed parse_html modules to bkmk_ph_* to avoid name clashes.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index e7d1d623b87d2c39d226b6968364bab176f62900..27e621b898ba4cf89499aea7e49943a9915974dd 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,9 +1,21 @@
-"""
-   Objects to represent bookmarks.html structure
+"""Objects to represent bookmarks.html structure
 
-   Written by Oleg Broytman. Copyright (C) 2000-2007 PhiloSoft Design.
+This file is a part of Bookmarks database and Internet robot.
 """
 
+__version__ = "$Revision$"[11:-2]
+__revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__license__ = "GNU GPL"
+
+__all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
+    'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',
+    'quote_title', 'unquote_title',
+]
+
+
 import os, cgi
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -44,13 +56,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
 
@@ -98,8 +111,7 @@ class Writer(Walker):
 
 
 class Robot:
-   def __init__(self, tempfname, log):
-      self.tempfname = tempfname
+   def __init__(self, log):
       self.log = log
 
    def stop(self):
@@ -179,4 +191,5 @@ def unquote_title(title):
    if BKMK_FORMAT == "MOZILLA":
       from HTMLParser import HTMLParser
       title = HTMLParser().unescape(title.replace("&amp;", '&'))
+      title = title.replace("&#39;", "'")
    return title