X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_robot_base.py;h=d2175ace96bc3c9d084cc3b3e0394ffe0929791e;hb=05f0cc396bc24da45fa1a8b0a79c97c79f399465;hp=3b5ec274760a59b3578e25a5bec87a7b7d09c7ac;hpb=1d9da433dcd7dfa9066cbaae66c6580f44f4b8d9;p=bookmarks_db.git diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py index 3b5ec27..d2175ac 100644 --- a/Robots/bkmk_robot_base.py +++ b/Robots/bkmk_robot_base.py @@ -15,7 +15,10 @@ from base64 import b64encode import sys import socket import time -import urllib +try: + from urllib.parse import splittype, splithost, splittag +except ImportError: + from urllib import splittype, splithost, splittag from urlparse import urljoin from m_lib.md5wrapper import md5wrapper @@ -62,10 +65,10 @@ class robot_base(Robot): self.start = int(time.time()) bookmark.icon = None - url_type, url_rest = urllib.splittype(bookmark.href) - url_host, url_path = urllib.splithost(url_rest) - url_path, url_tag = urllib.splittag(url_path) # noqa: E221 - # multiple spaces before operator + url_type, url_rest = splittype(bookmark.href) + url_host, url_path = splithost(url_rest) + url_path, url_tag = splittag(url_path) # noqa: E221 + # multiple spaces before operator url = "%s://%s%s" % (url_type, url_host, url_path) error, redirect_code, redirect_to, headers, content = \