Mercurial > public > mercurial-scm > hg
comparison mercurial/win32.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 | 232bf0028596 |
children | d6beeb618700 |
comparison
equal
deleted
inserted
replaced
25659:d60678a567a9 | 25660:328739ea70c3 |
---|---|
465 for tries in xrange(10): | 465 for tries in xrange(10): |
466 temp = '%s-%08x' % (f, random.randint(0, 0xffffffff)) | 466 temp = '%s-%08x' % (f, random.randint(0, 0xffffffff)) |
467 try: | 467 try: |
468 os.rename(f, temp) # raises OSError EEXIST if temp exists | 468 os.rename(f, temp) # raises OSError EEXIST if temp exists |
469 break | 469 break |
470 except OSError, e: | 470 except OSError as e: |
471 if e.errno != errno.EEXIST: | 471 if e.errno != errno.EEXIST: |
472 raise | 472 raise |
473 else: | 473 else: |
474 raise IOError(errno.EEXIST, "No usable temporary filename found") | 474 raise IOError(errno.EEXIST, "No usable temporary filename found") |
475 | 475 |