X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=bd5c71377bda4e71d3ee7322567a4a68516ff2b5;hb=d454f1d6aa7f2430d502d847693515f69489c66c;hp=7777ba33fc0bb9b35a862690e9d95238d355374e;hpb=b2b302b348f0b711557961c70744c818cff664f0;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 7777ba3..bd5c713 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -14,8 +14,8 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            ]
 
 
+from urllib.parse import urlsplit, quote, unquote
 import os
-import urllib
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -58,27 +58,24 @@ 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 = urllib.splittype(href)
-        user, password, port = None, None, None
-        host, path = urllib.splithost(request)
-        if host:
-            user, host = urllib.splituser(host)
-            if user:
-                user, password = urllib.splitpasswd(user)
-            host, port = urllib.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 + ":"
         else:
             href = protocol + "://"
         if user:
-            href += urllib.quote(user)
+            href += quote(user)
             if password:
-                href += ':' + urllib.quote(password)
+                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:
@@ -152,7 +149,8 @@ class InverseLinker(Walker):
 
     def start_folder(self, f, level):
         f.parent = self.parent_stack[-1]
-        self.parent_stack.append(f)  # Push the folder onto the stack of parents
+        # Push the folder onto the stack of parents
+        self.parent_stack.append(f)
 
     def end_folder(self, f, level):
         del self.parent_stack[-1]   # Pop off the stack
@@ -183,7 +181,8 @@ class Linear(Walker):
         self.add_object(r)
 
 
-# Helper - make linked linear represenatation of the tree, suitable to be stored in sequential storage
+# Helper - make linked linear represenatation of the tree,
+# suitable to be stored in sequential storage.
 def make_linear(root_folder):
     linker = InverseLinker()
     root_folder.walk_depth(linker)
@@ -192,7 +191,8 @@ def make_linear(root_folder):
     root_folder.walk_depth(linear)
 
 
-# Helper, opposite of make_linear - make a tree from the linked linear representation
+# Helper, opposite of make_linear -
+# make a tree from the linked linear representation.
 def make_tree(linear):
     root_folder = linear[0]
     del linear[0]
@@ -218,9 +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
 
 
@@ -230,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