except Ex, e: --> except Ex as e:

Nudge us towards python3 compatability by converting deprecated python2 syntax.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

offlineimap/folder/Base.py

@@ -321,11 +321,11 @@ class BaseFolder(object):
                                        OfflineImapError.ERROR.MESSAGE)
         except (KeyboardInterrupt): # bubble up CTRL-C
             raise
-        except OfflineImapError, e:
+        except OfflineImapError as e:
             if e.severity > OfflineImapError.ERROR.MESSAGE:
                 raise # buble severe errors up
             self.ui.error(e, exc_info()[2])
-        except Exception, e:
+        except Exception as e:
             self.ui.error(e, "Copying message %s [acc: %s]:\n %s" %\
                               (uid, self.accountname,
                                exc_info()[2]))
@@ -474,11 +474,11 @@ class BaseFolder(object):
                 action(dstfolder, statusfolder)
             except (KeyboardInterrupt):
                 raise
-            except OfflineImapError, e:
+            except OfflineImapError as e:
                 if e.severity > OfflineImapError.ERROR.FOLDER:
                     raise
                 self.ui.error(e, exc_info()[2])
-            except Exception, e:
+            except Exception as e:
                 self.ui.error(e, exc_info()[2], "Syncing folder %s [acc: %s]" %\
                                   (self, self.accountname))
                 raise # raise unknown Exceptions so we can fix them

offlineimap/folder/IMAP.py

@@ -97,7 +97,7 @@ class IMAPFolder(BaseFolder):
                 # Select folder and get number of messages
                 restype, imapdata = imapobj.select(self.getfullname(), True,
                                                    True)
-            except OfflineImapError, e:
+            except OfflineImapError as e:
                 # retry on dropped connections, raise otherwise
                 self.imapserver.releaseconnection(imapobj, True)
                 if e.severity == OfflineImapError.ERROR.FOLDER_RETRY:
@@ -219,7 +219,7 @@ class IMAPFolder(BaseFolder):
                     res_type, data = imapobj.uid('fetch', str(uid),
                                                  '(BODY.PEEK[])')
                     fails_left = 0
-                except imapobj.abort, e:
+                except imapobj.abort as e:
                     # Release dropped connection, and get a new one
                     self.imapserver.releaseconnection(imapobj, True)
                     imapobj = self.imapserver.acquireconnection()
@@ -314,7 +314,7 @@ class IMAPFolder(BaseFolder):
         headervalue = imapobj._quote(headervalue)
         try:
             matchinguids = imapobj.uid('search', 'HEADER', headername, headervalue)[1][0]
-        except imapobj.error, err:
+        except imapobj.error as err:
             # IMAP server doesn't implement search or had a problem.
             self.ui.debug('imap', "savemessage_searchforheader: got IMAP error '%s' while attempting to UID SEARCH for message with header %s" % (err, headername))
             return 0
@@ -545,7 +545,7 @@ class IMAPFolder(BaseFolder):
                                        imaputil.flagsmaildir2imap(flags),
                                        date, content)
                     retry_left = 0                # Mark as success
-                except imapobj.abort, e:
+                except imapobj.abort as e:
                     # connection has been reset, release connection and retry.
                     retry_left -= 1
                     self.imapserver.releaseconnection(imapobj, True)
@@ -557,7 +557,7 @@ class IMAPFolder(BaseFolder):
                               (self, self.getrepository(), str(e), dbg_output),
                                                OfflineImapError.ERROR.MESSAGE)
                     self.ui.error(e, exc_info()[2])
-                except imapobj.error, e: # APPEND failed
+                except imapobj.error as e: # APPEND failed
                     # If the server responds with 'BAD', append()
                     # raise()s directly.  So we catch that too.
                     # drop conn, it might be bad.

offlineimap/folder/LocalStatus.py

@@ -79,7 +79,7 @@ class LocalStatusFolder(BaseFolder):
                 uid, flags = line.split(':')
                 uid = long(uid)
                 flags = set(flags)
-            except ValueError, e:
+            except ValueError as e:
                 errstr = "Corrupt line '%s' in cache file '%s'" % \
                     (line, self.filename)
                 self.ui.warn(errstr)

offlineimap/folder/Maildir.py

@@ -257,7 +257,7 @@ class MaildirFolder(BaseFolder):
         try:
             fd = os.open(os.path.join(tmpdir, messagename),
                            os.O_EXCL|os.O_CREAT|os.O_WRONLY, 0666)
-        except OSError, e:
+        except OSError as e:
             if e.errno == 17: 
                 #FILE EXISTS ALREADY
                 severity = OfflineImapError.ERROR.MESSAGE
@@ -313,7 +313,7 @@ class MaildirFolder(BaseFolder):
             try:
                 os.rename(os.path.join(self.getfullname(), oldfilename),
                           os.path.join(self.getfullname(), newfilename))
-            except OSError, e:
+            except OSError as e:
                 raise OfflineImapError("Can't rename file '%s' to '%s': %s" % (
                                        oldfilename, newfilename, e[1]),
                                        OfflineImapError.ERROR.FOLDER)