X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_robot_base.py;h=fb8bb2d6eab923b78f7e0c83c9236a78e1e2750d;hb=6d04cae4210534002c2e6ac94d08c48f3d667646;hp=d6a87d31cd41682ee3d48549868442814a15cebe;hpb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;p=bookmarks_db.git

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index d6a87d3..fb8bb2d 100644
--- 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 = \
@@ -171,10 +174,10 @@ class robot_base(Robot):
                                 else:
                                     raise IOError("Too many redirects")
                             except:
-                                etype, emsg, tb = sys.exc_info()
+                                etype, emsg, _ = sys.exc_info()
                                 self.log("   no icon        : %s %s"
                                          % (etype, emsg))
-                                etype = emsg = tb = None
+                                etype = emsg = _ = None
                                 icons[icon_url] = None
                             else:
                                 content_type = icon_headers["Content-Type"]