]> git.phdru.name Git - bookmarks_db.git/commitdiff
Removed timeoutsocket - the timeout functionality has been implemented in socket...
authorOleg Broytman <phd@phdru.name>
Fri, 28 Dec 2007 20:08:03 +0000 (20:08 +0000)
committerOleg Broytman <phd@phdru.name>
Fri, 28 Dec 2007 20:08:03 +0000 (20:08 +0000)
git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@146 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23

Robots/bkmk_rsimple_tos.py

index 4f8588a3a215c44b02a310b1bcd13f419412cb42..4d47073d5617f81e3dc668ef0298245ea869131a 100644 (file)
@@ -1,23 +1,21 @@
 """
 """
-   Simple robot with timeoutsocket
+   Simple robot with socket's timeout
 
    Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design
 """
 
 
    Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design
 """
 
-
-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):
       try:
          return robot_simple.check_url(self, bookmark)
 class robot_simple_tos(robot_simple):
    def check_url(self, bookmark):
       try:
          return robot_simple.check_url(self, bookmark)
-
-      except (socket.error, timeoutsocket.Timeout), msg:
+      except socket.error, msg:
          bookmark.error = get_error(msg)
 
       self.finish_check_url(bookmark)
          bookmark.error = get_error(msg)
 
       self.finish_check_url(bookmark)
-
       return 1
       return 1