summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralclarks <57201106+alclarks@users.noreply.github.com>2020-02-21 08:48:36 +0000
committerGitHub <noreply@github.com>2020-02-21 10:48:36 +0200
commitd4331c56b4f6fe6f18caf19fc1ecf9fec14f7066 (patch)
treea59aa7ddc37597e23e29a1a29dfb7597bcd695c4
parent424e5686d82235e08f8108b8bbe034bc91421689 (diff)
downloadcpython-git-d4331c56b4f6fe6f18caf19fc1ecf9fec14f7066.tar.gz
bpo-9495: avoid confusing chained exception in argparse test (GH-17120)
-rw-r--r--Lib/test/test_argparse.py3
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index b095783a02..9899a53d6d 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -105,7 +105,8 @@ def stderr_to_parser_error(parse_args, *args, **kwargs):
code = sys.exc_info()[1].code
stdout = sys.stdout.getvalue()
stderr = sys.stderr.getvalue()
- raise ArgumentParserError("SystemExit", stdout, stderr, code)
+ raise ArgumentParserError(
+ "SystemExit", stdout, stderr, code) from None
finally:
sys.stdout = old_stdout
sys.stderr = old_stderr
diff --git a/Misc/ACKS b/Misc/ACKS
index b11ee9cdea..976c26eb91 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -312,6 +312,7 @@ Gilles Civario
Chris Clark
Diana Clarke
Laurie Clark-Michalek
+Alexander Clarkson
Mike Clarkson
Andrew Clegg
Brad Clements