mirror of https://github.com/python/cpython.git
When removing indexing/slicing on exceptions some places were changed
inappropriately from ``e[0]`` to ``e.message`` instead of ``e.args[0]``. The reason it needs to be the last option is the dichotomy of 'message' and 'args': 'message' can be the empty string but args[0] can have a value if more than one argument was passed.
This commit is contained in:
parent
3a38362592
commit
ca477b2280
|
@ -569,7 +569,7 @@ def _interpolate(self, section, option, rawval, vars):
|
|||
value = value % vars
|
||||
except KeyError as e:
|
||||
raise InterpolationMissingOptionError(
|
||||
option, section, rawval, e.message)
|
||||
option, section, rawval, e.args[0])
|
||||
else:
|
||||
break
|
||||
if "%(" in value:
|
||||
|
|
|
@ -156,7 +156,7 @@ def testBadModeArgument(self):
|
|||
try:
|
||||
f = open(TESTFN, bad_mode)
|
||||
except ValueError as msg:
|
||||
if msg.message != 0:
|
||||
if msg.args[0] != 0:
|
||||
s = str(msg)
|
||||
if s.find(TESTFN) != -1 or s.find(bad_mode) == -1:
|
||||
self.fail("bad error message for invalid mode: %s" % s)
|
||||
|
|
Loading…
Reference in New Issue