Skip to content

Commit b418ddb

Browse files
committed
Sort by omitting square brackets
1 parent eb07462 commit b418ddb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/manage/installs.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,8 @@ def _sk_sub(m):
152152
n = m.group(1)
153153
if not n:
154154
return ""
155-
if n == ".":
156-
return "-"
157-
if n == "-":
158-
return "."
155+
if n in "[]":
156+
return ""
159157
try:
160158
return f"{int(n):020}"
161159
except ValueError:
@@ -165,7 +163,7 @@ def _sk_sub(m):
165163

166164
def _make_alias_name_sortkey(n):
167165
import re
168-
return re.sub(r"(\d+|.|-)", _sk_sub, n)
166+
return re.sub(r"(\d+|\[|\])", _sk_sub, n)
169167

170168

171169
def get_install_alias_names(aliases, friendly=True, windowed=True):

tests/test_installs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ def test_get_install_to_run_with_range(patched_installs):
129129

130130

131131
def test_install_alias_make_alias_sortkey():
132-
assert ("pythonw00000000000000000003.00000000000000000064-exe"
132+
assert ("pythonw00000000000000000003-00000000000000000064.exe"
133133
== installs._make_alias_name_sortkey("pythonw3-64.exe"))
134+
assert ("pythonw00000000000000000003-00000000000000000064.exe"
135+
== installs._make_alias_name_sortkey("python[w]3[-64].exe"))
134136

135137
def test_install_alias_make_alias_key():
136138
assert ("python", "w", "3", "-64", ".exe") == installs._make_alias_key("pythonw3-64.exe")

0 commit comments

Comments
 (0)