}
def __init__(self, errcode, newurl):
Exception.__init__(self, "(%s) to %s" % (self.reloc_dict[errcode], newurl))
+ self.url = newurl
class MyURLopener(urllib.URLopener):
except (IndexError, ValueError):
raise RedirectException("html", "Bad redirect to %s (%s)" % (url, refresh))
else:
+ try:
+ timeout = int(refresh.split(';')[0])
+ except ValueError:
+ pass # float timeout
raise RedirectException("html", "%s (%s sec)" % (url, timeout))
# Get favicon.ico
if not icon:
icon = "/favicon.ico"
icon = urljoin("%s://%s%s" % (url_type, url_host, url_path), icon)
- if self.log: self.log(" icon : %s" % icon)
+ if self.log: self.log(" looking for icon at : %s" % icon)
try:
- fname, headers = urllib.urlretrieve(icon)
+ for i in range(8):
+ try:
+ fname, headers = urllib.urlretrieve(icon)
+ except RedirectException, e:
+ icon = e.url
+ if self.log: self.log(" redirect to : %s" % icon)
+ else:
+ break
+ else:
+ raise IOError("Too many redirects")
except:
etype, emsg, tb = sys.exc_info()
if self.log: self.log(" no icon : %s %s" % (etype, emsg))
icon = icon_file.read()
icon_file.close()
bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
+ if self.log: self.log(" got icon : %s" % content_type)
else:
- if self.log: self.log(" no icon : %s" % content_type)
+ if self.log: self.log(" no icon : bad content type %s" % content_type)
os.remove(fname)
except KeyError: