Mercurial > public > mercurial-scm > hg-stable
diff mercurial/exchange.py @ 25660:328739ea70c3
global: mass rewrite to use modern exception syntax
Python 2.6 introduced the "except type as instance" syntax, replacing
the "except type, instance" syntax that came before. Python 3 dropped
support for the latter syntax. Since we no longer support Python 2.4 or
2.5, we have no need to continue supporting the "except type, instance".
This patch mass rewrites the exception syntax to be Python 2.6+ and
Python 3 compatible.
This patch was produced by running `2to3 -f except -w -n .`.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 23 Jun 2015 22:20:08 -0700 |
| parents | 39f0064a3079 |
| children | 1c2df7c91cf2 |
line wrap: on
line diff
--- a/mercurial/exchange.py Tue Jun 23 22:38:21 2015 -0700 +++ b/mercurial/exchange.py Tue Jun 23 22:20:08 2015 -0700 @@ -215,7 +215,7 @@ localwlock = pushop.repo.wlock() locallock = pushop.repo.lock() pushop.locallocked = True - except IOError, err: + except IOError as err: pushop.locallocked = False if err.errno != errno.EACCES: raise @@ -646,16 +646,16 @@ try: try: reply = pushop.remote.unbundle(stream, ['force'], 'push') - except error.BundleValueError, exc: + except error.BundleValueError as exc: raise util.Abort('missing support for %s' % exc) try: trgetter = None if pushback: trgetter = pushop.trmanager.transaction op = bundle2.processbundle(pushop.repo, reply, trgetter) - except error.BundleValueError, exc: + except error.BundleValueError as exc: raise util.Abort('missing support for %s' % exc) - except error.PushkeyFailed, exc: + except error.PushkeyFailed as exc: partid = int(exc.partid) if partid not in pushop.pkfailcb: raise @@ -1061,7 +1061,7 @@ bundle = pullop.remote.getbundle('pull', **kwargs) try: op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction) - except error.BundleValueError, exc: + except error.BundleValueError as exc: raise util.Abort('missing support for %s' % exc) if pullop.fetch: @@ -1425,7 +1425,7 @@ def recordout(output): r.newpart('output', data=output, mandatory=False) tr.close() - except BaseException, exc: + except BaseException as exc: exc.duringunbundle2 = True if captureoutput and r is not None: parts = exc._bundle2salvagedoutput = r.salvageoutput()