Skip to content

Commit 45f5f52

Browse files
bpo-46510: update Python2-style exception handling in argparse (GH-30881)
1 parent ee60550 commit 45f5f52

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Lib/argparse.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,8 +1875,7 @@ def parse_known_args(self, args=None, namespace=None):
18751875
if self.exit_on_error:
18761876
try:
18771877
namespace, args = self._parse_known_args(args, namespace)
1878-
except ArgumentError:
1879-
err = _sys.exc_info()[1]
1878+
except ArgumentError as err:
18801879
self.error(str(err))
18811880
else:
18821881
namespace, args = self._parse_known_args(args, namespace)
@@ -2151,8 +2150,7 @@ def _read_args_from_files(self, arg_strings):
21512150
arg_strings.append(arg)
21522151
arg_strings = self._read_args_from_files(arg_strings)
21532152
new_arg_strings.extend(arg_strings)
2154-
except OSError:
2155-
err = _sys.exc_info()[1]
2153+
except OSError as err:
21562154
self.error(str(err))
21572155

21582156
# return the modified argument list
@@ -2502,9 +2500,9 @@ def _get_value(self, action, arg_string):
25022500
result = type_func(arg_string)
25032501

25042502
# ArgumentTypeErrors indicate errors
2505-
except ArgumentTypeError:
2503+
except ArgumentTypeError as err:
25062504
name = getattr(action.type, '__name__', repr(action.type))
2507-
msg = str(_sys.exc_info()[1])
2505+
msg = str(err)
25082506
raise ArgumentError(action, msg)
25092507

25102508
# TypeErrors or ValueErrors also indicate errors

0 commit comments

Comments
 (0)