From dd4a55d4969765d22e00bdcc741e7f86da237efb Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 1 Jun 2014 03:26:40 +0400 Subject: [PATCH] Do not assign icon errors to bookmark.error --- Robots/bkmk_robot_base.py | 7 +++++-- Robots/bkmk_rurllib.py | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py index 63fd73e..6226328 100644 --- a/Robots/bkmk_robot_base.py +++ b/Robots/bkmk_robot_base.py @@ -61,7 +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) + headers, content, error = self.urlretrieve(bookmark, url, True) + + if error: + bookmark.error = error if content is None: return 1 @@ -142,7 +145,7 @@ class robot_base(Robot): _icon_url = icon_url for i in range(8): try: - icon_headers, icon_data = self.urlretrieve(bookmark, _icon_url) + icon_headers, icon_data, error = self.urlretrieve(bookmark, _icon_url) except RedirectException, e: _icon_url = e.url self.log(" redirect to : %s" % _icon_url) diff --git a/Robots/bkmk_rurllib.py b/Robots/bkmk_rurllib.py index f0a614e..a2174a8 100644 --- a/Robots/bkmk_rurllib.py +++ b/Robots/bkmk_rurllib.py @@ -87,17 +87,18 @@ class robot_urllib(robot_base): content = infile.read() infile.close() - return headers, content + return headers, content, None except IOError, msg: if (msg[0] == "http error") and (msg[1] == -1): + error = None bookmark.no_error = "The server did not return any header - it is not an error, actually" self.log(' no headers: %s' % bookmark.no_error) else: - bookmark.error = get_error(msg) - self.log(' Error: %s' % bookmark.error) + error = get_error(msg) + self.log(' Error: %s' % error) - return None, None + return None, None, error def get_ftp_welcome(self): global ftpcache_key -- 2.39.5