diff -r d60678a567a9 -r 328739ea70c3 mercurial/changegroup.py --- a/mercurial/changegroup.py Tue Jun 23 22:38:21 2015 -0700 +++ b/mercurial/changegroup.py Tue Jun 23 22:20:08 2015 -0700 @@ -491,7 +491,7 @@ if revlog.iscensored(base) or revlog.iscensored(rev): try: delta = revlog.revision(node) - except error.CensoredNodeError, e: + except error.CensoredNodeError as e: delta = e.tombstone if base == nullrev: prefix = mdiff.trivialdiffheader(len(delta)) @@ -665,7 +665,7 @@ try: if not fl.addgroup(source, revmap, trp): raise util.Abort(_("received file revlog group is empty")) - except error.CensoredBaseError, e: + except error.CensoredBaseError as e: raise util.Abort(_("received delta base is censored: %s") % e) revisions += len(fl) - o files += 1