Insert a space.

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 19595a1a94bae2ed7a4b59ff50d6d1563643d8fd..00e186c794b8f1a32220c94b69fd7424bc25aeb4 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -16,8 +16,7 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
 ]
 
 
-import os, cgi
-from m_lib.defenc import default_encoding as DEFAULT_CHARSET
+import os
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -58,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