X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=00e186c794b8f1a32220c94b69fd7424bc25aeb4;hb=53961cb13ce4b5d4ce932253db73c78d0620ae2b;hp=0ba0255719d6c190067e97e619d8a9c39cbd9337;hpb=dece2621d869f1a54fdbc1e77df48e30284449b7;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 0ba0255..00e186c 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,13 +1,25 @@
-"""
-   Objects to represent bookmarks.html structure
+"""Objects to represent bookmarks.html structure
 
-   Written by Oleg BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+This file is a part of Bookmarks database and Internet robot.
 """
 
-import os, cgi
-BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
+__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
+
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
+
 class Folder(list):
    isFolder = 1
    isBookmark = 0
@@ -44,13 +56,21 @@ 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):
+      if isinstance(href, str):
+         try:
+            href = href.decode('idna')
+         except UnicodeDecodeError: # Non-ascii href
+            href = href.decode('utf-8')
+      elif not isinstance(href, unicode):
+          raise TypeError("Bookmark's href must be str or unicode, not %r" % type(href))
       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 +118,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 +198,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