diff -r d60678a567a9 -r 328739ea70c3 mercurial/commandserver.py
--- a/mercurial/commandserver.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/mercurial/commandserver.py	Tue Jun 23 22:20:08 2015 -0700
@@ -300,9 +300,9 @@
                 sv.serve()
             # handle exceptions that may be raised by command server. most of
             # known exceptions are caught by dispatch.
-            except util.Abort, inst:
+            except util.Abort as inst:
                 ui.warn(_('abort: %s\n') % inst)
-            except IOError, inst:
+            except IOError as inst:
                 if inst.errno != errno.EPIPE:
                     raise
             except KeyboardInterrupt: