X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple_tos.py;h=0be22b843f421c5bd58505ce42bea75c3df4f4b3;hb=8bc6571d6eaba3a72ecb543c0fe9b95dbea31634;hp=581fb6988e54b0b1f7703c13343550d7ee5fe56a;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple_tos.py b/Robots/bkmk_rsimple_tos.py index 581fb69..0be22b8 100644 --- a/Robots/bkmk_rsimple_tos.py +++ b/Robots/bkmk_rsimple_tos.py @@ -1,24 +1,22 @@ -#! /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 + Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design """ - -import socket, timeoutsocket -timeoutsocket.setDefaultSocketTimeout(900) +import socket +socket.setdefaulttimeout(900) 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