Rename CWD to PROG_DIR

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 281b95c0f57747f0a728b27046b587bd49556c89..23fb816ee180100100722ee2b7ac9818cf63390d 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,13 +1,11 @@
 """Objects to represent bookmarks.html structure
 
 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"
+__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
@@ -68,7 +66,10 @@ class Bookmark:
          host, port = urllib.splitport(host)
          if port: port = int(port)
 
-      href = protocol + "://"
+      if protocol == 'place':
+         href = protocol + ":"
+      else:
+         href = protocol + "://"
       if user:
          href += urllib.quote(user)
          if password:
@@ -214,6 +215,6 @@ def quote_title(title):
 def unquote_title(title):
    if BKMK_FORMAT == "MOZILLA":
       from HTMLParser import HTMLParser
-      title = HTMLParser().unescape(title.replace("&amp;", '&'))
-      title = title.replace("&#39;", "'")
+      title = HTMLParser().unescape(title.replace("&amp;", '&').decode('utf-8'))
+      title = title.encode('utf-8').replace("&#39;", "'")
    return title