X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=bkmk_objects.py;h=00e186c794b8f1a32220c94b69fd7424bc25aeb4;hb=53961cb13ce4b5d4ce932253db73c78d0620ae2b;hp=d15c38e52d440c2a7bc29a827b75e86953917d3a;hpb=832eb757ef7f81abf1e431ce16f368c10dd57962;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index d15c38e..00e186c 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -10,9 +10,15 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-import os, cgi
-BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
+__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
@@ -51,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