From 1de93c8f031e43d2f8662cebf0d8a82a91e81749 Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <michael.j.fromberger@gmail.com>
Date: Wed, 22 Jul 2020 09:41:49 -0700
Subject: [PATCH] Fix obsolete catch tuple syntax.

---
 eyepopper.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eyepopper.py b/eyepopper.py
index 64dd4de..7df0b9d 100644
--- a/eyepopper.py
+++ b/eyepopper.py
@@ -511,7 +511,7 @@ def cmd_ADDBOX(self, cmd, data):
             self.server.mail_add_mailbox(data)
             self.wfile.write('+OK Mailbox added %s\r\n' % data)
             self._diag('- Client requested mailbox "%s".', data)
-        except (OSError, IOError), e:
+        except (OSError, IOError) as e:
             self.wfile.write('-ERR Mailbox not added (%s)\r\n' % e.strerror)
 
     def handle(self):
@@ -565,7 +565,7 @@ def handle(self):
 
             self._diag('* REQUEST COMPLETE\n')
 
-        except socket.error, e:
+        except socket.error as e:
             pass
 
         self.wfile.close()
@@ -613,7 +613,7 @@ def usage(short=True):
         opts, args = getopt.gnu_getopt(
             argv, 'haEp:qu:',
             ('help', 'apop', 'noerror', 'port=', 'quiet', 'user='))
-    except getopt.GetoptError, e:
+    except getopt.GetoptError as e:
         print >> sys.stderr, "Error: %s" % e
         usage()
         return 1
@@ -662,7 +662,7 @@ def usage(short=True):
                 boxes.append(Maildir(path))
             else:
                 boxes.append(MailboxFile(path))
-    except (OSError, IOError), e:
+    except (OSError, IOError) as e:
         print >> sys.stderr, "Error: %s" % e
         return 2