Skip to content

Commit 52655d8

Browse files
committed
simplify the code
1 parent 69c0bf7 commit 52655d8

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

examples/bzlmod/MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/private/pypi/render_pkg_aliases.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,14 @@ If the value is missing, then the "default" Python version is being used,
6161
which has a "null" version value and will not match version constraints.
6262
"""
6363

64-
def _repr_actual(actual):
65-
if len(actual) == 1 and None in actual:
66-
return repr(actual.values()[0])
67-
else:
68-
return render.indent(render.dict(actual)).lstrip()
64+
def _repr_actual(aliases):
65+
if len(aliases) == 1 and not aliases[0].version and not aliases[0].config_setting:
66+
return repr(aliases[0].repo)
67+
68+
actual = {}
69+
for alias in aliases:
70+
actual[alias.config_setting or ("//_config:is_python_" + alias.version)] = alias.repo
71+
return render.indent(render.dict(actual)).lstrip()
6972

7073
def _render_common_aliases(*, name, aliases, extra_aliases = [], group_name = None):
7174
return """\
@@ -80,10 +83,7 @@ pkg_aliases(
8083
extra_aliases = {extra_aliases},
8184
)""".format(
8285
name = name,
83-
actual = _repr_actual({
84-
a.config_setting: a.repo
85-
for a in aliases
86-
}),
86+
actual = _repr_actual(aliases),
8787
group_name = repr(group_name),
8888
extra_aliases = repr(extra_aliases),
8989
)

0 commit comments

Comments
 (0)