urllib._urlopener = MyURLopener()
# Fake headers to pretend this is a real browser
-_version = "Mozilla/5.0 (X11; U; Linux 2.6 i686; en) Gecko/20001221 Firefox/2.0.0"
-urllib._urlopener.addheaders[0] = ('User-Agent', _version)
-_version = "bookmarks_db (Python %d.%d.%d; urllib/%s)" % (
+_user_agent = "Mozilla/5.0 (X11; U; Linux 2.6 i686; en) Gecko/20001221 Firefox/2.0.0"
+urllib._urlopener.addheaders[0] = ('User-Agent', _user_agent)
+_x_user_agent = "bookmarks_db (Python %d.%d.%d; urllib/%s)" % (
sys.version_info[0], sys.version_info[1], sys.version_info[2], urllib.__version__)
-urllib._urlopener.addheader('X-User-Agent', _version)
+urllib._urlopener.addheader('X-User-Agent', _x_user_agent)
urllib._urlopener.addheader('Referer', '')
-urllib._urlopener.addheader('Connection', 'close')
urllib._urlopener.addheader('Accept', '*/*')
urllib._urlopener.addheader('Accept-Language', 'ru,en')
urllib._urlopener.addheader('Cache-Control', 'max-age=300')
+urllib._urlopener.addheader('Connection', 'close')
urllib_ftpwrapper = urllib.ftpwrapper
except RedirectException, e:
return None, e.errcode, e.newurl, None, None
- except IOError, msg:
- if (msg[0] == "http error") and (msg[1] == -1):
+ except IOError, e:
+ if (e[0] == "http error") and (e[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:
- error = get_error(msg)
+ error = get_error(e)
self.log(' Error: %s' % error)
return error, None, None, None, None
# 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()