Skip to content

gh-96859: [argparse] Avoid copying lists on every append and extend action #124740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

gh-96859: [argparse] Avoid copying lists on every append and extend action #124740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions Lib/argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def _get_args(self):
def _copy_items(items):
if items is None:
return []
# The copy module is used only in the 'append' and 'append_const'
# The copy module is used only in the 'append', 'append_const', and 'extend'
# actions, and it is needed only when the default value isn't a list.
# Delay its import for speeding up the common case.
if type(items) is list:
Expand Down Expand Up @@ -835,7 +835,7 @@ def _get_kwargs(self):
def format_usage(self):
return self.option_strings[0]

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
raise NotImplementedError(_('.__call__() not defined'))


Expand Down Expand Up @@ -866,7 +866,7 @@ def __init__(self,
deprecated=deprecated)


def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
if option_string in self.option_strings:
setattr(namespace, self.dest, not option_string.startswith('--no-'))

Expand Down Expand Up @@ -907,7 +907,7 @@ def __init__(self,
metavar=metavar,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
setattr(namespace, self.dest, values)


Expand All @@ -932,7 +932,7 @@ def __init__(self,
help=help,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
setattr(namespace, self.dest, self.const)


Expand Down Expand Up @@ -1007,9 +1007,13 @@ def __init__(self,
metavar=metavar,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
items = getattr(namespace, self.dest, None)
items = _copy_items(items)

if self.dest not in cache:
cache.add(self.dest)
items = _copy_items(items)

items.append(values)
setattr(namespace, self.dest, items)

Expand All @@ -1036,9 +1040,13 @@ def __init__(self,
metavar=metavar,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
items = getattr(namespace, self.dest, None)
items = _copy_items(items)

if self.dest not in cache:
cache.add(self.dest)
items = _copy_items(items)

items.append(self.const)
setattr(namespace, self.dest, items)

Expand All @@ -1061,7 +1069,7 @@ def __init__(self,
help=help,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
count = getattr(namespace, self.dest, None)
if count is None:
count = 0
Expand All @@ -1084,7 +1092,7 @@ def __init__(self,
help=help,
deprecated=deprecated)

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
parser.print_help()
parser.exit()

Expand All @@ -1108,7 +1116,7 @@ def __init__(self,
help=help)
self.version = version

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
version = self.version
if version is None:
version = parser.version
Expand Down Expand Up @@ -1191,7 +1199,7 @@ def add_parser(self, name, *, deprecated=False, **kwargs):
def _get_subactions(self):
return self._choices_actions

def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
parser_name = values[0]
arg_strings = values[1:]

Expand Down Expand Up @@ -1228,9 +1236,13 @@ def __call__(self, parser, namespace, values, option_string=None):
getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings)

class _ExtendAction(_AppendAction):
def __call__(self, parser, namespace, values, option_string=None):
def __call__(self, parser, cache, namespace, values, option_string=None):
items = getattr(namespace, self.dest, None)
items = _copy_items(items)

if self.dest not in cache:
cache.add(self.dest)
items = _copy_items(items)

items.extend(values)
setattr(namespace, self.dest, items)

Expand Down Expand Up @@ -1941,6 +1953,7 @@ def _parse_known_args(self, arg_strings, namespace):
# converts arg strings to the appropriate and then takes the action
seen_actions = set()
seen_non_default_actions = set()
cache = set()
warned = set()

def take_action(action, argument_strings, option_string=None):
Expand All @@ -1960,7 +1973,7 @@ def take_action(action, argument_strings, option_string=None):
# take the action if we didn't receive a SUPPRESS value
# (e.g. from a default)
if argument_values is not SUPPRESS:
action(self, namespace, argument_values, option_string)
action(self, cache, namespace, argument_values, option_string)

# function to convert arg_strings into an optional action
def consume_optional(start_index):
Expand Down
Loading