comparison mercurial/match.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 b76410eed482
children ff5172c83002
comparison
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
291 try: 291 try:
292 includepats = readpatternfile(pat, self._warn) 292 includepats = readpatternfile(pat, self._warn)
293 for k, p, source in self._normalize(includepats, default, 293 for k, p, source in self._normalize(includepats, default,
294 root, cwd, auditor): 294 root, cwd, auditor):
295 kindpats.append((k, p, source or pat)) 295 kindpats.append((k, p, source or pat))
296 except util.Abort, inst: 296 except util.Abort as inst:
297 raise util.Abort('%s: %s' % (pat, inst[0])) 297 raise util.Abort('%s: %s' % (pat, inst[0]))
298 except IOError, inst: 298 except IOError as inst:
299 if self._warn: 299 if self._warn:
300 self._warn(_("skipping unreadable pattern file " 300 self._warn(_("skipping unreadable pattern file "
301 "'%s': %s\n") % (pat, inst.strerror)) 301 "'%s': %s\n") % (pat, inst.strerror))
302 continue 302 continue
303 # else: re or relre - which cannot be normalized 303 # else: re or relre - which cannot be normalized