X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple_tos.py;h=ad42f09a73077370e68bcd1accf076d6230a78e5;hb=909520d4a6662f80532e347c5a633201a4234e16;hp=581fb6988e54b0b1f7703c13343550d7ee5fe56a;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git

diff --git a/Robots/bkmk_rsimple_tos.py b/Robots/bkmk_rsimple_tos.py
index 581fb69..ad42f09 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-2011 PhiloSoft Design
 """
 
+import socket
+socket.setdefaulttimeout(900)
 
-import socket, timeoutsocket
-timeoutsocket.setDefaultSocketTimeout(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