X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=d672bcfc7f2850e0e7c98d5fec7adf7148d50b16;hb=refs%2Ftags%2F5.2.2;hp=b9dabff1e316a66c36d14a9f3d0911f4b60f6b2c;hpb=9e2bf3eaee5a8ee84c61ee5eac9c55090d45f63f;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index b9dabff..d672bcf 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2024 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
@@ -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 + ":"
@@ -228,8 +218,13 @@ def quote_title(title):
 
 def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
-        from HTMLParser import HTMLParser
-        title = HTMLParser().unescape(
+        try:
+            from HTMLParser import HTMLParser
+        except ImportError:
+            from html import unescape
+        else:
+            unescape = HTMLParser().unescape
+        title = unescape(
             title.replace("&amp;", '&'))
         title = title.replace("&#39;", "'")
     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