X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_robot_base.py;h=dce593310c1a1461749f189ca49dbd3b269f06cb;hb=d2c2975d4cd9375460c7bbaaa3b6dbb855e84b86;hp=6226328388c78e75e4cedf90604760a84517be40;hpb=dd4a55d4969765d22e00bdcc741e7f86da237efb;p=bookmarks_db.git diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py index 6226328..dce5933 100644 --- a/Robots/bkmk_robot_base.py +++ b/Robots/bkmk_robot_base.py @@ -61,12 +61,10 @@ class robot_base(Robot): url_path, url_tag = urllib.splittag(url_path) url = "%s://%s%s" % (url_type, url_host, url_path) - headers, content, error = self.urlretrieve(bookmark, url, True) + error, headers, content = self.get(bookmark, url, True) if error: bookmark.error = error - - if content is None: return 1 size = 0 @@ -145,7 +143,7 @@ class robot_base(Robot): _icon_url = icon_url for i in range(8): try: - icon_headers, icon_data, error = self.urlretrieve(bookmark, _icon_url) + error, icon_headers, icon_data = self.get(bookmark, _icon_url) except RedirectException, e: _icon_url = e.url self.log(" redirect to : %s" % _icon_url)