mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Python 3.10.0a0 (GH-20198)

Browse source
This commit is contained in:
Pablo Galindo 2020-05-19 03:33:01 +01:00 • committed by GitHub
parent 9095f76613
commit d4fe098d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 951 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/getpath.c
View file

@ -1297,7 +1297,7 @@ calculate_zip_path(PyCalculatePath *calculate)
PyStatus res;
/* Path: <PLATLIBDIR> / "python00.zip" */
wchar_t *path = joinpath2(calculate->platlibdir_macro, L"python00.zip");
wchar_t *path = joinpath2(calculate->platlibdir_macro, L"python000.zip");
if (path == NULL) {
return _PyStatus_NO_MEMORY();
}
@ -1305,7 +1305,7 @@ calculate_zip_path(PyCalculatePath *calculate)
if (calculate->prefix_found > 0) {
/* Use the reduced prefix returned by Py_GetPrefix()
Path: <basename(basename(prefix))> / <PLATLIBDIR> / "python00.zip" */
Path: <basename(basename(prefix))> / <PLATLIBDIR> / "python000.zip" */
wchar_t *parent = _PyMem_RawWcsdup(calculate->prefix);
if (parent == NULL) {
res = _PyStatus_NO_MEMORY();
@ -1325,10 +1325,11 @@ calculate_zip_path(PyCalculatePath *calculate)
goto done;
}
/* Replace "00" with version */
/* Replace "000" with the version */
size_t len = wcslen(calculate->zip_path);
calculate->zip_path[len - 6] = VERSION[0];
calculate->zip_path[len - 5] = VERSION[2];
calculate->zip_path[len - 7] = VERSION[0];
calculate->zip_path[len - 6] = VERSION[2];
calculate->zip_path[len - 5] = VERSION[3];
res = _PyStatus_OK();