diff options
| author | Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> | 2022-01-25 15:34:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 15:34:03 (GMT) |
| commit | 45f5f52601ebccb195c19cb0a77beaf7f7dfa56a (patch) | |
| tree | a346f40671f9041131cdcdfcd56f7fcc16f118c1 /Lib/argparse.py | |
| parent | ee60550e9ba3ab94ca43a890cf4313b63ffa1a81 (diff) | |
| download | cpython-45f5f52601ebccb195c19cb0a77beaf7f7dfa56a.zip cpython-45f5f52601ebccb195c19cb0a77beaf7f7dfa56a.tar.gz cpython-45f5f52601ebccb195c19cb0a77beaf7f7dfa56a.tar.bz2 | |
bpo-46510: update Python2-style exception handling in argparse (GH-30881)
Diffstat (limited to 'Lib/argparse.py')
| -rw-r--r-- | Lib/argparse.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 9344dab..3c6aa3c 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1875,8 +1875,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): if self.exit_on_error: try: namespace, args = self._parse_known_args(args, namespace) - except ArgumentError: - err = _sys.exc_info()[1] + except ArgumentError as err: self.error(str(err)) else: namespace, args = self._parse_known_args(args, namespace) @@ -2151,8 +2150,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): arg_strings.append(arg) arg_strings = self._read_args_from_files(arg_strings) new_arg_strings.extend(arg_strings) - except OSError: - err = _sys.exc_info()[1] + except OSError as err: self.error(str(err)) # return the modified argument list @@ -2502,9 +2500,9 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): result = type_func(arg_string) # ArgumentTypeErrors indicate errors - except ArgumentTypeError: + except ArgumentTypeError as err: name = getattr(action.type, '__name__', repr(action.type)) - msg = str(_sys.exc_info()[1]) + msg = str(err) raise ArgumentError(action, msg) # TypeErrors or ValueErrors also indicate errors |