from base64 import b64encode
+from urllib.parse import urlsplit, urljoin
import sys
import socket
import time
-try:
- from urllib.parse import splittype, splithost, splittag, urljoin
-except ImportError:
- from urllib import splittype, splithost, splittag
- from urlparse import urljoin
from m_lib.md5wrapper import md5wrapper
from m_lib.net.www.util import parse_time
self.start = int(time.time())
bookmark.icon = None
- 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
+ split_results = urlsplit(bookmark.href)
+ url_type, netloc, url_path, query, url_tag = split_results
+ url_host = split_results.hostname
url = "%s://%s%s" % (url_type, url_host, url_path)
error, redirect_code, redirect_to, headers, content = \