Fix(Py3): Fix `urljoin` import

[bookmarks_db.git] / Robots / bkmk_robot_base.py

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index 3b5ec274760a59b3578e25a5bec87a7b7d09c7ac..fb8bb2d6eab923b78f7e0c83c9236a78e1e2750d 100644 (file)
--- a/Robots/bkmk_robot_base.py
+++ b/Robots/bkmk_robot_base.py
@@ -15,8 +15,11 @@ from base64 import b64encode
 import sys
 import socket
 import time
-import urllib
-from urlparse import urljoin
+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
@@ -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 = \