From 4bfc1e82275233ff11a45bc01e8fdd3bf5f92319 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 27 Sep 2011 14:08:20 +0200 Subject: [PATCH] except imapobj.abort() -> except imapobj.abort When checking for the IMAP4.abort() exception, we need of course to perform: except imapobj.abort: and not except imapobj.abort(): Thanks to Johannes Stezenbach for pointing to the glitch. Signed-off-by: Sebastian Spaeth --- offlineimap/folder/IMAP.py | 2 +- offlineimap/imapserver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py index 00361b0..8dbd7aa 100644 --- a/offlineimap/folder/IMAP.py +++ b/offlineimap/folder/IMAP.py @@ -209,7 +209,7 @@ class IMAPFolder(BaseFolder): res_type, data = imapobj.uid('fetch', str(uid), '(BODY.PEEK[])') fails_left = 0 - except imapobj.abort(), e: + except imapobj.abort, e: # Release dropped connection, and get a new one self.imapserver.releaseconnection(imapobj, True) imapobj = self.imapserver.acquireconnection() diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py index ead3280..ef54e31 100644 --- a/offlineimap/imapserver.py +++ b/offlineimap/imapserver.py @@ -549,7 +549,7 @@ class IdleThread(object): try: # End IDLE mode with noop, imapobj can point to a dropped conn. imapobj.noop() - except imapobj.abort(): + except imapobj.abort: self.ui.warn('Attempting NOOP on dropped connection %s' % \ imapobj.identifier) self.parent.releaseconnection(imapobj, True)