X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=57006da577ccf581317e80e2e2c94dd6a082fd7c;hb=67061c83af5f8afeb67532b4a1ae854e750235f8;hp=1842b4d7ff94e73327f127afa2b71a74c61f7ed8;hpb=74c815aa9af0b6947b1a2caeb390bade05b5e1ca;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py index 1842b4d..57006da 100644 --- a/Robots/bkmk_rsimple.py +++ b/Robots/bkmk_rsimple.py @@ -44,8 +44,7 @@ class MyURLopener(urllib.URLopener): urllib._urlopener = MyURLopener() -# Some sites allow only Mozilla-compatible browsers; way to stop robots? -server_version = "Mozilla/3.0 (compatible; Python-urllib/%s)" % urllib.__version__ +server_version = "bookmarks_db (Python-urllib/%s)" % urllib.__version__ urllib._urlopener.addheaders[0] = ('User-agent', server_version) @@ -178,13 +177,15 @@ class robot_simple(Robot): emsg = None tb = None else: - icon_file = open(fname, "rb") - icon = icon_file.read() - icon_file.close() - os.remove(fname) content_type = headers["Content-Type"] if content_type.startswith("image/"): + icon_file = open(fname, "rb") + icon = icon_file.read() + icon_file.close() bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon)) + else: + if self.log: self.log(" no icon : %s" % content_type) + os.remove(fname) except KeyError: pass