Insert a space.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index a9567e22134fd70b9adcefe788c2b2bb3a45746f..00e186c794b8f1a32220c94b69fd7424bc25aeb4 100644 (file)
--- 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 Broytman. Copyright (C) 2000-2010 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
@@ -45,6 +57,13 @@ class Bookmark:
 
    def __init__(self, href, add_date, last_visit=None, last_modified=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
@@ -99,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):