From 9b33bf50dae997b01dfe24878a58100da61b89e1 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 23 May 2017 16:25:25 -0700 Subject: Improves test_underpth_nosite_file to reveal why it fails. (#1763) * Improves test_underpth_nosite_file to reveal why it fails. * Enable building with Windows 10 SDK. * Fix WinSDK detection * Fix initialization on Windows when a ._pth file exists. * Fix tabs * Adds comment about Py_GetPath call. --- Python/pylifecycle.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 03601ead4d..d2b277748f 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -412,10 +412,15 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) if (interp->sysdict == NULL) Py_FatalError("Py_Initialize: can't initialize sys dict"); Py_INCREF(interp->sysdict); + + /* GetPath may initialize state that _PySys_EndInit locks + in, and so has to be called first. + + Hopefully one day Eric Snow will fix this. */ + PySys_SetPath(Py_GetPath()); if (_PySys_EndInit(interp->sysdict) < 0) Py_FatalError("Py_Initialize: can't initialize sys"); _PyImport_FixupBuiltin(sysmod, "sys"); - PySys_SetPath(Py_GetPath()); PyDict_SetItemString(interp->sysdict, "modules", interp->modules); -- cgit v1.2.1