Mercurial > public > mercurial-scm > hg

comparison mercurial/config.py @ 25660:328739ea70c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3182965b3971
children a027a0813b44
comparison
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
120 inc = os.path.normpath(os.path.join(base, expanded)) 120 inc = os.path.normpath(os.path.join(base, expanded))
121 121
122 try: 122 try:
123 include(inc, remap=remap, sections=sections) 123 include(inc, remap=remap, sections=sections)
124 break 124 break
125 except IOError, inst: 125 except IOError as inst:
126 if inst.errno != errno.ENOENT: 126 if inst.errno != errno.ENOENT:
127 raise error.ParseError(_("cannot include %s (%s)") 127 raise error.ParseError(_("cannot include %s (%s)")
128 % (inc, inst.strerror), 128 % (inc, inst.strerror),
129 "%s:%s" % (src, line)) 129 "%s:%s" % (src, line))
130 continue 130 continue