X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=1f27c988ec8b7956942064ddbb1885aebd64dfb3;hb=39125836fc96da8bd411da9b03bdc14b48eb4e9d;hp=741567039d7763077e1255ef162e6f09bb498e28;hpb=7212b79ec48ec9947048b9fcbe0903b125fdf542;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 7415670..1f27c98 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
 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 + ":"