Minor refactoring: reorder return values

[bookmarks_db.git] / Robots / bkmk_robot_base.py

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index 63fd73e08e9e71b0423d44eca0b8c9a1db671725..dce593310c1a1461749f189ca49dbd3b269f06cb 100644 (file)
--- a/Robots/bkmk_robot_base.py
+++ b/Robots/bkmk_robot_base.py
@@ -61,9 +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 = self.urlretrieve(bookmark, url, True)
+         error, headers, content = self.get(bookmark, url, True)
 
-         if content is None:
+         if error:
+             bookmark.error = error
              return 1
 
          size = 0
@@ -142,7 +143,7 @@ class robot_base(Robot):
                         _icon_url = icon_url
                         for i in range(8):
                            try:
-                              icon_headers, icon_data = 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)