X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rurllib.py;h=efade79a328d9c8724877cf1819b5b86570c66e3;hb=8fedded7827ae1d79b31ec38d8e3146bb1a7bea1;hp=f0a614e3799e1ccae9750bd57fbbf5c4f99ccd90;hpb=9d989c8c9ebd7f13e9f0fdc95fa139c99ed83387;p=bookmarks_db.git

diff --git a/Robots/bkmk_rurllib.py b/Robots/bkmk_rurllib.py
index f0a614e..efade79 100644
--- a/Robots/bkmk_rurllib.py
+++ b/Robots/bkmk_rurllib.py
@@ -17,8 +17,8 @@ from Robots.bkmk_robot_base import robot_base, RedirectException, get_error
 
 
 class MyURLopener(urllib.URLopener):
-   # Error 302 -- relocated (temporarily)
-   def http_error_302(self, url, fp, errcode, errmsg, headers, data=None): 
+   # Error 301 -- relocated (permanently)
+   def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): 
       if headers.has_key('location'):
          newurl = headers['location']
       elif headers.has_key('uri'):
@@ -27,10 +27,12 @@ class MyURLopener(urllib.URLopener):
          newurl = "Nowhere"
       raise RedirectException(errcode, newurl)
 
-   # Error 301 -- also relocated (permanently)
-   http_error_301 = http_error_302
-   # Error 307 -- also relocated (temporary)
-   http_error_307 = http_error_302
+   # Error 302 -- relocated (temporarily)
+   http_error_302 = http_error_301
+   # Error 303 -- relocated (see other)
+   http_error_303 = http_error_301
+   # Error 307 -- relocated (temporarily)
+   http_error_307 = http_error_301
 
    # Error 401 -- authentication required
    def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): 
@@ -87,17 +89,18 @@ class robot_urllib(robot_base):
          content = infile.read()
          infile.close()
 
-         return headers, content
+         return headers, content, None
 
       except IOError, msg:
          if (msg[0] == "http error") and (msg[1] == -1):
+            error = None
             bookmark.no_error = "The server did not return any header - it is not an error, actually"
             self.log('   no headers: %s' % bookmark.no_error)
          else:
-            bookmark.error = get_error(msg)
-            self.log('   Error: %s' % bookmark.error)
+            error = get_error(msg)
+            self.log('   Error: %s' % error)
 
-         return None, None
+         return None, None, error
 
    def get_ftp_welcome(self):
       global ftpcache_key