import sys, os
import time, urllib
-from Robots.bkmk_robot_base import robot_base, RedirectException, get_error
+from Robots.bkmk_robot_base import robot_base, get_error
+class RedirectException(Exception):
+ def __init__(self, errcode, newurl):
+ Exception.__init__(self)
+ self.errcode = errcode
+ self.newurl = newurl
+
class MyURLopener(urllib.URLopener):
# Error 301 -- relocated (permanently)
def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
content = infile.read()
infile.close()
- return headers, content, None
+ return None, None, None, headers, content
+
+ except RedirectException, e:
+ return None, e.errcode, e.newurl, None, None
except IOError, msg:
if (msg[0] == "http error") and (msg[1] == -1):
error = get_error(msg)
self.log(' Error: %s' % error)
- return None, None, error
+ return error, None, None, None, None
def get_ftp_welcome(self):
global ftpcache_key
# If there are - ftpcache_key in prev line is invalid.
return _welcome
- def cleanup(self):
+ def finish_check_url(self, bookmark):
+ robot_base.finish_check_url(self, bookmark)
urllib.urlcleanup()