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.
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
bpo-30152: Reduce the number of imports for argparse. #1269
Changes from 7 commits
eccaf69
79b085f
30c87cd
46c77d3
d8a622c
dad5bae
578af90
48a2abf
502bf6a
c449538
025688d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,15 +84,12 @@ | |
|
||
|
||
import collections as _collections | ||
import copy as _copy | ||
import os as _os | ||
import re as _re | ||
import sys as _sys | ||
import textwrap as _textwrap | ||
|
||
from gettext import gettext as _, ngettext | ||
|
||
|
||
SUPPRESS = '==SUPPRESS==' | ||
|
||
OPTIONAL = '?' | ||
|
@@ -137,10 +134,16 @@ def _get_args(self): | |
return [] | ||
|
||
|
||
def _ensure_value(namespace, name, value): | ||
if getattr(namespace, name, None) is None: | ||
setattr(namespace, name, value) | ||
return getattr(namespace, name) | ||
def _copy_items(items): | ||
if items is None: | ||
return [] | ||
# The copy module is used only in the 'append' and 'append_const' | ||
# 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: | ||
return items[:] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not items.copy()? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is shorter. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And it's faster. |
||
import copy | ||
items = copy.copy(items) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shouldn't that be 'return copy.copy(items)' ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, right! |
||
|
||
|
||
# =============== | ||
|
@@ -617,12 +620,17 @@ def _iter_indented_subactions(self, action): | |
|
||
def _split_lines(self, text, width): | ||
text = self._whitespace_matcher.sub(' ', text).strip() | ||
return _textwrap.wrap(text, width) | ||
# The textwrap module is used only for formatting help. | ||
# Delay its import for speeding up the common usage of argparse. | ||
import textwrap | ||
return textwrap.wrap(text, width) | ||
|
||
def _fill_text(self, text, width, indent): | ||
text = self._whitespace_matcher.sub(' ', text).strip() | ||
return _textwrap.fill(text, width, initial_indent=indent, | ||
subsequent_indent=indent) | ||
import textwrap | ||
return textwrap.fill(text, width, | ||
initial_indent=indent, | ||
subsequent_indent=indent) | ||
|
||
def _get_help_string(self, action): | ||
return action.help | ||
|
@@ -950,7 +958,8 @@ def __init__(self, | |
metavar=metavar) | ||
|
||
def __call__(self, parser, namespace, values, option_string=None): | ||
items = _copy.copy(_ensure_value(namespace, self.dest, [])) | ||
items = getattr(namespace, self.dest, None) | ||
items = _copy_items(items) | ||
items.append(values) | ||
setattr(namespace, self.dest, items) | ||
|
||
|
@@ -976,7 +985,8 @@ def __init__(self, | |
metavar=metavar) | ||
|
||
def __call__(self, parser, namespace, values, option_string=None): | ||
items = _copy.copy(_ensure_value(namespace, self.dest, [])) | ||
items = getattr(namespace, self.dest, None) | ||
items = _copy_items(items) | ||
items.append(self.const) | ||
setattr(namespace, self.dest, items) | ||
|
||
|
@@ -998,8 +1008,10 @@ def __init__(self, | |
help=help) | ||
|
||
def __call__(self, parser, namespace, values, option_string=None): | ||
new_count = _ensure_value(namespace, self.dest, 0) + 1 | ||
setattr(namespace, self.dest, new_count) | ||
count = getattr(namespace, self.dest, None) | ||
if count is None: | ||
count = 0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not just use getattr(namespace, self.dest, 0) and not have the if test? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If think the current code is equivalent to |
||
setattr(namespace, self.dest, count + 1) | ||
|
||
|
||
class _HelpAction(Action): | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
import sys | ||
from types import MappingProxyType, DynamicClassAttribute | ||
from functools import reduce | ||
from operator import or_ as _or_ | ||
|
||
# try _collections first to reduce startup cost | ||
try: | ||
|
@@ -744,11 +742,10 @@ def __xor__(self, other): | |
|
||
def __invert__(self): | ||
members, uncovered = _decompose(self.__class__, self._value_) | ||
inverted_members = [ | ||
m for m in self.__class__ | ||
if m not in members and not m._value_ & self._value_ | ||
] | ||
inverted = reduce(_or_, inverted_members, self.__class__(0)) | ||
inverted = self.__class__(0) | ||
for m in self.__class__: | ||
if m not in members and not (m._value_ & self._value_): | ||
inverted = inverted | m | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see how this change is related to removing imports. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
return self.__class__(inverted) | ||
|
||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,11 +46,9 @@ | |
# find this format documented anywhere. | ||
|
||
|
||
import copy | ||
import locale | ||
import os | ||
import re | ||
import struct | ||
import sys | ||
from errno import ENOENT | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it be worth it to defer errno import as well? It's only used in one case, to raise an error when something goes wrong. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is imported by |
||
|
||
|
@@ -337,7 +335,9 @@ def _get_versions(self, version): | |
|
||
def _parse(self, fp): | ||
"""Override this method to support alternative .mo formats.""" | ||
unpack = struct.unpack | ||
# Delay struct import for speeding up gettext import when .mo files | ||
# are not used. | ||
from struct import unpack | ||
filename = getattr(fp, 'name', '') | ||
# Parse the .mo file header, which consists of 5 little endian 32 | ||
# bit words. | ||
|
@@ -528,6 +528,9 @@ def translation(domain, localedir=None, languages=None, | |
# Copy the translation object to allow setting fallbacks and | ||
# output charset. All other instance data is shared with the | ||
# cached object. | ||
# Delay copy import for speeding up gettext import when .mo files | ||
# are not used. | ||
import copy | ||
t = copy.copy(t) | ||
if codeset: | ||
t.set_output_charset(codeset) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not isinstance(items, list)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
list
subclass can override__copy__
or__reduce__
.