Skip to content

bpo-38506: Fix the Windows launcher's mishandling of 3.10 #18307

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

Merged
zooba merged 4 commits into from
Nov 16, 2020
Merged

bpo-38506: Fix the Windows launcher's mishandling of 3.10 #18307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b55948
bpo-38506: Fix the Windows launcher's mishandling of 3.10
ZackerySpytz Feb 2, 2020
ac17e8f
Merge remote-tracking branch 'upstream/master' into bpo-38506-win-lau…
ZackerySpytz Nov 16, 2020
501bea3
Make the requested changes.
ZackerySpytz Nov 16, 2020
5f21819
news entry
ZackerySpytz Nov 16, 2020
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2020-11-15-23-01-14.bpo-38506.hhdnuP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The Windows launcher now properly handles Python 3.10 when listing installed
Python versions.
20 changes: 15 additions & 5 deletions PC/launcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,21 @@ compare_pythons(const void * p1, const void * p2)
INSTALLED_PYTHON * ip1 = (INSTALLED_PYTHON *) p1;
INSTALLED_PYTHON * ip2 = (INSTALLED_PYTHON *) p2;
/* note reverse sorting on version */
int result = wcscmp(ip2->version, ip1->version);

if (result == 0)
result = ip2->bits - ip1->bits; /* 64 before 32 */
return result;
int result = CompareStringW(LOCALE_INVARIANT, SORT_DIGITSASNUMBERS,
ip2->version, -1, ip1->version, -1);
switch (result) {
case 0:
error(0, L"CompareStringW failed");
return 0;
case CSTR_LESS_THAN:
return -1;
case CSTR_EQUAL:
return ip2->bits - ip1->bits; /* 64 before 32 */
case CSTR_GREATER_THAN:
return 1;
default:
return 0; // This should never be reached.
}
}

static void
Expand Down