mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
bpo-46411: Remove unnecessary calls to sys.exc_info() in tests (GH-30638)
This commit is contained in:
parent
c47c9e6589
commit
a287b31bcb
6 changed files with 14 additions and 16 deletions
|
@ -102,8 +102,8 @@ def stderr_to_parser_error(parse_args, *args, **kwargs):
|
|||
if getattr(result, key) is sys.stderr:
|
||||
setattr(result, key, old_stderr)
|
||||
return result
|
||||
except SystemExit:
|
||||
code = sys.exc_info()[1].code
|
||||
except SystemExit as e:
|
||||
code = e.code
|
||||
stdout = sys.stdout.getvalue()
|
||||
stderr = sys.stderr.getvalue()
|
||||
raise ArgumentParserError(
|
||||
|
@ -1850,8 +1850,7 @@ class TestActionUserDefined(ParserTestCase):
|
|||
raise AssertionError('value: %s' % value)
|
||||
assert expected_ns == namespace, ('expected %s, got %s' %
|
||||
(expected_ns, namespace))
|
||||
except AssertionError:
|
||||
e = sys.exc_info()[1]
|
||||
except AssertionError as e:
|
||||
raise ArgumentParserError('opt_action failed: %s' % e)
|
||||
setattr(namespace, 'spam', value)
|
||||
|
||||
|
@ -1876,8 +1875,7 @@ class TestActionUserDefined(ParserTestCase):
|
|||
raise AssertionError('value: %s' % value)
|
||||
assert expected_ns == namespace, ('expected %s, got %s' %
|
||||
(expected_ns, namespace))
|
||||
except AssertionError:
|
||||
e = sys.exc_info()[1]
|
||||
except AssertionError as e:
|
||||
raise ArgumentParserError('arg_action failed: %s' % e)
|
||||
setattr(namespace, 'badger', value)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue