X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rurllib.py;h=00a4a42b1824ce9fe37dc6cb2f9761cb65e7f3e5;hb=aaa16e28a73fcc01ff9fa5709c72970bb50629d7;hp=f71a8d2bb55d22f5f823e44fae765abc800c7e32;hpb=7c74826d0861c0c18d78d030ee96c572dad24961;p=bookmarks_db.git diff --git a/Robots/bkmk_rurllib.py b/Robots/bkmk_rurllib.py index f71a8d2..00a4a42 100644 --- a/Robots/bkmk_rurllib.py +++ b/Robots/bkmk_rurllib.py @@ -11,9 +11,7 @@ __license__ = "GNU GPL" __all__ = ['robot_urllib'] -import os import sys -import time import urllib from Robots.bkmk_robot_base import robot_base, get_error @@ -29,9 +27,9 @@ class RedirectException(Exception): class MyURLopener(urllib.URLopener): # Error 301 -- relocated (permanently) def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): - if headers.has_key('location'): + if 'location' in headers: newurl = headers['location'] - elif headers.has_key('uri'): + elif 'uri' in headers: newurl = headers['uri'] else: newurl = "Nowhere" @@ -51,7 +49,7 @@ class MyURLopener(urllib.URLopener): def http_error_default(self, url, fp, errcode, errmsg, headers): if fp: - void = fp.read() + fp.read() fp.close() raise IOError(('http error', errcode, errmsg, headers))