[tor-commits] [flashproxy/master] IMAP4.error includes IMAP4.abort, and we want to catch both.

[dcf at torproject.org]

commit 58b97aea786eeb35a1d1b4d9270bdc28fa399dc1
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Oct 9 13:39:43 2013 -0700

    IMAP4.error includes IMAP4.abort, and we want to catch both.
---
 facilitator/facilitator-email-poller |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller
index 0e94474..33d4ed7 100755
--- a/facilitator/facilitator-email-poller
+++ b/facilitator/facilitator-email-poller
@@ -408,7 +408,7 @@ while True:
     try:
         imap = imap_login()
         imap_loop(imap)
-    except (imaplib.IMAP4.abort, ssl.SSLError, SSL.SSLError, socket.error), e:
+    except (imaplib.IMAP4.error, ssl.SSLError, SSL.SSLError, socket.error), e:
         # Try again after a disconnection.
         log(u"lost server connection: %s" % str(e))
     except KeyboardInterrupt: