X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=b9dabff1e316a66c36d14a9f3d0911f4b60f6b2c;hb=9e2bf3eaee5a8ee84c61ee5eac9c55090d45f63f;hp=4850261ef529c854708b5eb0437323720ed9d41e;hpb=e784339181e160ebaf4ee5e21e00c50712823421;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 4850261..b9dabff 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -85,7 +85,7 @@ class Bookmark(object):
                 href += ':' + quote(password)
             href += '@'
         if host:
-            href += host.decode(parser_charset or 'utf-8').encode('idna')
+            href += host.encode('idna').decode('ascii')
             if port:
                 href += ':%d' % port
         if path:
@@ -230,8 +230,8 @@ def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
         from HTMLParser import HTMLParser
         title = HTMLParser().unescape(
-            title.replace("&", '&').decode('utf-8'))
-        title = title.encode('utf-8').replace("'", "'")
+            title.replace("&", '&'))
+        title = title.replace("'", "'")
     return title