-#! /usr/local/bin/python -O
-"""
- Simpl robot with timeoutsocket
+"""Simple robot with socket's timeout
- Written by BroytMann, Sep 2000. Copyright (C) 2000 PhiloSoft Design
+This file is a part of Bookmarks database and Internet robot.
"""
+__version__ = "$Revision$"[11:-2]
+__revision__ = "$Id$"[5:-2]
+__date__ = "$Date$"[7:-2]
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__license__ = "GNU GPL"
+
+__all__ = ['robot_simple_tos']
+
-import socket, timeoutsocket
-timeoutsocket.setDefaultSocketTimeout(900)
+import socket
+socket.setdefaulttimeout(900)
+
+from .bkmk_rsimple import robot_simple, get_error
-from bkmk_rsimple import robot_simple, get_error
class robot_simple_tos(robot_simple):
- def check_url(self, bookmark, url_type, url_rest):
+ def check_url(self, bookmark):
try:
- return robot_simple.check_url(self, bookmark, url_type, url_rest)
-
- except (socket.error, timeoutsocket.Timeout), msg:
+ return robot_simple.check_url(self, bookmark)
+ except socket.error, msg:
bookmark.error = get_error(msg)
+ self.log(bookmark.error)
self.finish_check_url(bookmark)
-
return 1