File tree 1 file changed +3
-9
lines changed
1 file changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -1296,16 +1296,16 @@ calculate_zip_path(PyCalculatePath *calculate)
1296
1296
{
1297
1297
PyStatus res ;
1298
1298
1299
- /* Path: <PLATLIBDIR> / "python00 .zip" */
1300
- wchar_t * path = joinpath2 (calculate -> platlibdir_macro , L"python000 .zip" );
1299
+ /* Path: <PLATLIBDIR> / "pythonXY .zip" */
1300
+ wchar_t * path = joinpath2 (calculate -> platlibdir_macro , L"python" Py_STRINGIFY ( PY_MAJOR_VERSION ) Py_STRINGIFY ( PY_MINOR_VERSION ) L" .zip" );
1301
1301
if (path == NULL ) {
1302
1302
return _PyStatus_NO_MEMORY ();
1303
1303
}
1304
1304
1305
1305
if (calculate -> prefix_found > 0 ) {
1306
1306
/* Use the reduced prefix returned by Py_GetPrefix()
1307
1307
1308
- Path: <basename(basename(prefix))> / <PLATLIBDIR> / "python000 .zip" */
1308
+ Path: <basename(basename(prefix))> / <PLATLIBDIR> / "pythonXY .zip" */
1309
1309
wchar_t * parent = _PyMem_RawWcsdup (calculate -> prefix );
1310
1310
if (parent == NULL ) {
1311
1311
res = _PyStatus_NO_MEMORY ();
@@ -1325,12 +1325,6 @@ calculate_zip_path(PyCalculatePath *calculate)
1325
1325
goto done ;
1326
1326
}
1327
1327
1328
- /* Replace "000" with the version */
1329
- size_t len = wcslen (calculate -> zip_path );
1330
- calculate -> zip_path [len - 7 ] = VERSION [0 ];
1331
- calculate -> zip_path [len - 6 ] = VERSION [2 ];
1332
- calculate -> zip_path [len - 5 ] = VERSION [3 ];
1333
-
1334
1328
res = _PyStatus_OK ();
1335
1329
1336
1330
done :
You can’t perform that action at this time.
0 commit comments