Handle ftp - get welcome message

diff --git a/Robots/bkmk_rurllib2.py b/Robots/bkmk_rurllib2.py
index 49c556850c8bd2718d70b9604750a3aa43ad8b37..d9c91491be35f384d4d35d802111e3522e74e6a7 100644 (file)
--- a/Robots/bkmk_rurllib2.py
+++ b/Robots/bkmk_rurllib2.py
@@ -17,9 +17,19 @@ import urllib2
 from Robots.bkmk_robot_base import robot_base, get_error
 
 
+_fw = None
+
+class FTPHandler(urllib2.FTPHandler):
+    def connect_ftp(self, user, passwd, host, port, dirs, timeout):
+        global _fw
+        _fw = urllib2.FTPHandler.connect_ftp(self, user, passwd, host, port,
+                                             dirs, timeout)
+        return _fw
+
+
 opener = urllib2.OpenerDirector()
 default_classes = [urllib2.HTTPHandler, urllib2.HTTPDefaultErrorHandler,
-                   urllib2.FTPHandler, urllib2.HTTPErrorProcessor]
+                   FTPHandler, urllib2.HTTPErrorProcessor]
 if hasattr(httplib, 'HTTPS'):
     default_classes.insert(0, urllib2.HTTPSHandler)
 for klass in default_classes:
@@ -35,7 +45,7 @@ _x_user_agent = "bookmarks_db (Python %d.%d.%d; urllib2)" % (
 
 
 class robot_urllib2(robot_base):
-   def get(self, bookmark, url, accept_charset=False):
+    def get(self, bookmark, url, accept_charset=False):
         request = urllib2.Request(url)
         request.add_header('Accept', '*/*')
         if accept_charset and bookmark.charset:
@@ -47,27 +57,37 @@ class robot_urllib2(robot_base):
         request.add_header('User-agent', _user_agent)
         request.add_header('X-User-Agent', _x_user_agent)
 
+        global _fw
+        _fw = None
+
         try:
             response = urllib2.urlopen(request)
+
         except urllib2.HTTPError, e:
             if e.code in (301, 302, 303, 307):
                 return None, e.code, e.hdrs['Location'], None, None
             else:
                 self.log('   HTTP Error %s: %s' % (e.code, e.msg))
                 return "HTTP Error %s: %s" % (e.code, e.msg), None, None, None, None
+
         except urllib2.URLError, e:
             self.log('   URL Error: %s' % e.reason)
             return "URL Error: %s" % e.reason, None, None, None, None
+
         except httplib.HTTPException, e:
             error = get_error(e)
             self.log('   HTTP Exception: %s' % error)
             return "HTTP Exception: %s" % error, None, None, None, None
+
         except IOError, e:
             error = get_error(e)
             self.log('   I/O Error: %s' % error)
             return "I/O Error: %s" % error, None, None, None, None
+
         else:
             return None, None, None, response.info(), response.read()
 
-   def get_ftp_welcome(self):
-      return ''
+    def get_ftp_welcome(self):
+        if _fw is None:
+            return ''
+        return _fw.ftp.welcome

diff --git a/doc/TODO b/doc/TODO
index 72008993c548b6ea1747e9f91127e25c25095b20..7e98a6ece9e6a47a7772281cc1747b7f3aaa1e4a 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,5 +1,3 @@
-Robot based on urllib2: handle ftp (welcome message).
-
 A new robot based on PycURL.
 
 HTML parser based on BeautifulSoup4.