X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=f18dface219f183fd23bdc69980ef4848c710684;hb=7ebd86416b89bf67bb97f7680b87660f8cdc0cf7;hp=96135824be74d83867458e0b0af73caf2df5687a;hpb=33b4d2a832edf09a5ee26f6508d6e762eefaa119;p=bookmarks_db.git

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index 9613582..f18dfac 100644
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -45,6 +45,12 @@ class MyURLopener(urllib.URLopener):
    def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): 
       raise IOError, ('http error', errcode, "Authentication required ", headers)
 
+   def http_error_default(self, url, fp, errcode, errmsg, headers):
+      if fp:
+         void = fp.read()
+         fp.close()
+      raise IOError, ('http error', errcode, errmsg, headers)
+
 
 urllib._urlopener = MyURLopener()
 
@@ -80,7 +86,7 @@ class myftpwrapper(urllib_ftpwrapper):
    def __init__(self, user, passwd, host, port, dirs):
       urllib_ftpwrapper.__init__(self, user, passwd, host, port, dirs)
       global ftpcache_key
-      ftpcache_key = (user, host, port, tuple(dirs))
+      ftpcache_key = (user, host, port, '/'.join(dirs))
 
 urllib.ftpwrapper = myftpwrapper
 
@@ -243,6 +249,11 @@ class robot_simple(Robot):
          except KeyboardInterrupt:
             return 0
 
+         except:
+            import traceback
+            traceback.print_exc()
+            bookmark.error = "Exception!"
+
       finally:
          self.finish_check_url(bookmark)