issue2551186 - replace socket.sslerror in mailgw.py.

roundup/mailgw.py:

    replaced socket.sslerror with anypy/ssl_.SSLError
    also looks like a socket.sslerror was removed from pops handling.
      added it back using method above.

roundupanypy/ssl_.py:
    defines replacement SSLError suitable for python2 or 3

tested by running nc -lp 995 or 993 (pop3s/imaps) and sending
gibberish when mailgw connects. This generates a bad version number
SSLError.

I need to get my imap and pop mock servers included for testing at
some point, but I am not sure how to make them bind to the right port
as they are priv ports.

Author: rouilj

CHANGES.txt

@@ -69,6 +69,10 @@ Fixed:
   --prefix=/tmp/r2. Force insert --old-and-unmangable to get it
   to use a classic installer and not an easy install. This only
   affects python2.
+- issue2551186 - Python versions >= 3.3 no longer use socket.sslerror.
+  Andrew (kragacles) patched uses of socket.sslerror in mailgy.py.
+  Patch adapted to allow trapping sslerror under both python2 and 3.
+  (John Rouillard)
 
 Features:
 

roundup/anypy/ssl_.py

@@ -0,0 +1,6 @@
+try:
+    # Python 3+
+    from ssl import SSLError
+except (ImportError, AttributeError):
+    # Python 2.5-2.7
+    from socket import sslerror as SSLError

roundup/mailgw.py

@@ -112,6 +112,7 @@ class node. Any parts of other types are each stored in separate files
 from roundup.hyperdb import iter_roles
 from roundup.anypy.strings import StringIO, b2s, u2s
 import roundup.anypy.random_ as random_
+import roundup.anypy.ssl_ as ssl_
 
 try:
     import gpg, gpg.core, gpg.constants, gpg.constants.sigsum
@@ -1373,7 +1374,7 @@ def do_imap(self, server, user='', password='', mailbox='', ssl=0, cram=0):
             else:
                 self.logger.debug('Trying server %r without ssl' % server)
                 server = imaplib.IMAP4(server)
-        except (imaplib.IMAP4.error, socket.error, socket.sslerror):
+        except (imaplib.IMAP4.error, socket.error, ssl_.SSLError):
             self.logger.exception('IMAP server error')
             return 1
 
@@ -1415,7 +1416,7 @@ def do_imap(self, server, user='', password='', mailbox='', ssl=0, cram=0):
         finally:
             try:
                 server.expunge()
-            except (imaplib.IMAP4.error, socket.error, socket.sslerror):
+            except (imaplib.IMAP4.error, socket.error, ssl_.SSLError):
                 pass
             server.logout()
 
@@ -1461,7 +1462,7 @@ def _do_pop(self, server, user, password, apop, ssl):
             else:
                 klass = poplib.POP3
             server = klass(server)
-        except socket.error:
+        except (socket.error, ssl_.SSLError):
             self.logger.exception('POP server error')
             return 1
         if apop: