X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=bd5c71377bda4e71d3ee7322567a4a68516ff2b5;hb=ed7127ea175cab12642244ebd2d86276adcb2e25;hp=4850261ef529c854708b5eb0437323720ed9d41e;hpb=05f0cc396bc24da45fa1a8b0a79c97c79f399465;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 4850261..bd5c713 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -14,15 +14,8 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            ]
 
 
+from urllib.parse import urlsplit, quote, unquote
 import os
-try:
-    from urllib.parse import quote, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport
-except ImportError:
-    from urllib import quote, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -65,15 +58,12 @@ class Bookmark(object):
     def __init__(self, href, add_date, last_visit=None, last_modified=None,
                  keyword=None, comment='', icon_href=None, icon=None,
                  charset=None, parser_charset=None):
-        protocol, request = splittype(href)
-        user, password, port = None, None, None
-        host, path = splithost(request)
-        if host:
-            user, host = splituser(host)
-            if user:
-                user, password = splitpasswd(user)
-            host, port = splitport(host)
-            if port: port = int(port)
+        split_results = urlsplit(href)
+        protocol, netloc, path, query, tag = split_results
+        user = split_results.username
+        password = split_results.password
+        host = split_results.hostname
+        port = split_results.port
 
         if protocol == 'place':
             href = protocol + ":"
@@ -85,7 +75,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:
@@ -228,10 +218,15 @@ def quote_title(title):
 
 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("'", "'")
+        try:
+            from HTMLParser import HTMLParser
+        except ImportError:
+            from html import unescape
+        else:
+            unescape = HTMLParser().unescape
+        title = unescape(
+            title.replace("&", '&'))
+        title = title.replace("'", "'")
     return title
 
 
@@ -241,7 +236,7 @@ def parse_params(param_str):
     param_list = {}
     for param in params:
         key, value = param.split('=', 1)
-        param_list[key] = value
+        param_list[key] = unquote(value)
     return main_param, param_list