cpython: 781454f792c4 (original) (raw)

Mercurial > cpython

changeset 92427:781454f792c4 3.4

Issue #17095: Temporarily revert getpath.c change that added the Modules directory to sys.path when running from a build directory. That has proven to be problematic for several standard library modules with C extension modules whose builds can fail on some platforms. [#17095]

Ned Deily nad@acm.org
date	Sun, 14 Sep 2014 19:19:49 -0700
parents	c62fad86fac3
children	d3939f602e1f 0668b3daa84e
files	Modules/getpath.c
diffstat	1 files changed, 0 insertions(+), 14 deletions(-)[+] [-] Modules/getpath.c 14

line wrap: on

line diff

--- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -734,11 +734,6 @@ calculate_path(void) bufsz += wcslen(zip_path) + 1; bufsz += wcslen(exec_prefix) + 1;

/* When running from the build directory, add room for the Modules
```
* subdirectory too.[](#l1.8)
```
```
*/[](#l1.9)
```
if (efound == -1)

   bufsz += wcslen(argv0_path) + wcslen(L"Modules") + 2;[](#l1.11)

buf = (wchar_t )PyMem_Malloc(bufsz * sizeof(wchar_t)); if (buf == NULL) { @@ -786,15 +781,6 @@ calculate_path(void) / Finally, on goes the directory for dynamic-load modules */ wcscat(buf, exec_prefix);

/* And, if we run from a build directory, the Modules directory (for
- modules built with Modules/Setup.)
*/
if (efound == -1) {
```
  wcscat(buf, delimiter);[](#l1.23)
```
```
  wcscat(buf, argv0_path);[](#l1.24)
```
```
  wcscat(buf, separator);[](#l1.25)
```
```
  wcscat(buf, L"Modules");[](#l1.26)
```
} /* And publish the results */ module_search_path = buf;