X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=blobdiff_plain;f=bkmk_objects.py;h=281b95c0f57747f0a728b27046b587bd49556c89;hp=be139edb3e205379733c8e7d38f8db42f2ce4c77;hb=6eae6e394f44a55e5be10aa59408bdf76d0af9e0;hpb=01e7f1237af1fa33a1feb0d07d5bb2e5e438962e diff --git a/bkmk_objects.py b/bkmk_objects.py index be139ed..281b95c 100644 --- a/bkmk_objects.py +++ b/bkmk_objects.py @@ -67,13 +67,6 @@ class Bookmark: user, password = urllib.splitpasswd(user) host, port = urllib.splitport(host) if port: port = int(port) - path, tag = urllib.splittag(path) - path, query = urllib.splitquery(path) - path = urllib.unquote(path) - if tag: tag = urllib.unquote_plus(tag) - - if host: # host can be None for Mozilla's place: URLs - host = host.decode(parser_charset or 'utf-8').encode('idna') href = protocol + "://" if user: @@ -82,18 +75,11 @@ class Bookmark: href += ':' + urllib.quote(password) href += '@' if host: - href += host + href += host.decode(parser_charset or 'utf-8').encode('idna') if port: href += ':%d' % port if path: - if protocol == "file": - href += urllib.quote(path) - else: - href += urllib.quote(path) - if query: - href += '?' + query - if tag: - href += '#' + urllib.quote_plus(tag) + href += path self.href = href self.add_date = add_date