X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=bf5904b3287d2872dd6e871398751bc3118c6700;hb=HEAD;hp=1f27c988ec8b7956942064ddbb1885aebd64dfb3;hpb=39125836fc96da8bd411da9b03bdc14b48eb4e9d;p=bookmarks_db.git diff --git a/bkmk_objects.py b/bkmk_objects.py index 1f27c98..bf5904b 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 " -__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,7 +14,7 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot', ] -from urllib.parse import urlsplit, quote +from urllib.parse import unquote import os BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA") @@ -58,29 +58,6 @@ 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): - 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 += quote(user) - if password: - href += ':' + quote(password) - href += '@' - if host: - href += host.encode('idna').decode('ascii') - if port: - href += ':%d' % port - if path: - href += path - self.href = href self.add_date = add_date self.last_visit = last_visit @@ -236,7 +213,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