diff -r d60678a567a9 -r 328739ea70c3 mercurial/context.py
--- a/mercurial/context.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/mercurial/context.py	Tue Jun 23 22:20:08 2015 -0700
@@ -1438,7 +1438,7 @@
     def copy(self, source, dest):
         try:
             st = self._repo.wvfs.lstat(dest)
-        except OSError, err:
+        except OSError as err:
             if err.errno != errno.ENOENT:
                 raise
             self._repo.ui.warn(_("%s does not exist!\n") % dest)
@@ -1684,7 +1684,7 @@
         t, tz = self._changectx.date()
         try:
             return (int(self._repo.wvfs.lstat(self._path).st_mtime), tz)
-        except OSError, err:
+        except OSError as err:
             if err.errno != errno.ENOENT:
                 raise
             return (t, tz)