Skip to content

Commit 83e045b

Browse files
Use dict and set comprehensions when possible
1 parent 9609574 commit 83e045b

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ Tools/msi/obj
159159
Tools/ssl/amd64
160160
Tools/ssl/win32
161161
Tools/freeze/test/outdir
162+
/.project
163+
/.pydevproject
162164

163165
# The frozen modules are always generated by the build so we don't
164166
# keep them in the repo. Also see Tools/build/freeze_modules.py.

Lib/_compat_pickle.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@
161161
NAME_MAPPING[("multiprocessing", excname)] = ("multiprocessing.context", excname)
162162

163163
# Same, but for 3.x to 2.x
164-
REVERSE_IMPORT_MAPPING = dict((v, k) for (k, v) in IMPORT_MAPPING.items())
164+
REVERSE_IMPORT_MAPPING = {v: k for (k, v) in IMPORT_MAPPING.items()}
165165
assert len(REVERSE_IMPORT_MAPPING) == len(IMPORT_MAPPING)
166-
REVERSE_NAME_MAPPING = dict((v, k) for (k, v) in NAME_MAPPING.items())
166+
REVERSE_NAME_MAPPING = {v: k for (k, v) in NAME_MAPPING.items()}
167167
assert len(REVERSE_NAME_MAPPING) == len(NAME_MAPPING)
168168

169169
# Non-mutual mappings.

Lib/_pydecimal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3891,14 +3891,14 @@ def __init__(self, prec=None, rounding=None, Emin=None, Emax=None,
38913891
if traps is None:
38923892
self.traps = dc.traps.copy()
38933893
elif not isinstance(traps, dict):
3894-
self.traps = dict((s, int(s in traps)) for s in _signals + traps)
3894+
self.traps = {s: int(s in traps) for s in _signals + traps}
38953895
else:
38963896
self.traps = traps
38973897

38983898
if flags is None:
38993899
self.flags = dict.fromkeys(_signals, 0)
39003900
elif not isinstance(flags, dict):
3901-
self.flags = dict((s, int(s in flags)) for s in _signals + flags)
3901+
self.flags = {s: int(s in flags) for s in _signals + flags}
39023902
else:
39033903
self.flags = flags
39043904

Lib/cmd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ def get_names(self):
295295

296296
def complete_help(self, *args):
297297
commands = set(self.completenames(*args))
298-
topics = set(a[5:] for a in self.get_names()
299-
if a.startswith('help_' + args[0]))
298+
topics = {a[5:] for a in self.get_names()
299+
if a.startswith('help_' + args[0])}
300300
return list(commands | topics)
301301

302302
def do_help(self, arg):

Lib/enum.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ def __call__(self, enumeration):
19851985
raise ValueError('aliases found in %r: %s' %
19861986
(enumeration, alias_details))
19871987
elif check is CONTINUOUS:
1988-
values = set(e.value for e in enumeration)
1988+
values = {e.value for e in enumeration}
19891989
if len(values) < 2:
19901990
continue
19911991
low, high = min(values), max(values)

Lib/logging/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,9 +1809,9 @@ def _hierlevel(logger):
18091809
# exclude PlaceHolders - the last check is to ensure that lower-level
18101810
# descendants aren't returned - if there are placeholders, a logger's
18111811
# parent field might point to a grandparent or ancestor thereof.
1812-
return set(item for item in d.values()
1812+
return {item for item in d.values()
18131813
if isinstance(item, Logger) and item.parent is self and
1814-
_hierlevel(item) == 1 + _hierlevel(item.parent))
1814+
_hierlevel(item) == 1 + _hierlevel(item.parent)}
18151815

18161816
def __repr__(self):
18171817
level = getLevelName(self.getEffectiveLevel())

Lib/signal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def getsignal(signalnum):
6969
@_wraps(_signal.pthread_sigmask)
7070
def pthread_sigmask(how, mask):
7171
sigs_set = _signal.pthread_sigmask(how, mask)
72-
return set(_int_to_enum(x, Signals) for x in sigs_set)
72+
return {_int_to_enum(x, Signals) for x in sigs_set}
7373

7474

7575
if 'sigpending' in _globals:

Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,7 @@ James Tocknell
19311931
Bennett Todd
19321932
R Lindsay Todd
19331933
Eugene Toder
1934+
Heikki Toivonen
19341935
Erik Tollerud
19351936
Stephen Tonkin
19361937
Matias Torchinsky
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use dict and set comprehensions when possible

0 commit comments

Comments
 (0)