diff options
| author | Ned Deily <nad@acm.org> | 2014-09-15 02:21:05 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-09-15 02:21:05 (GMT) |
| commit | 45759a39246938997291ff0bc8e8d995dbc98300 (patch) | |
| tree | 0bbbad28defc77872b924d5415107a108fb17b0e /Modules/getpath.c | |
| parent | 02a8f9e9acbe55efcbb7ebc3f821d3d2f9cca368 (diff) | |
| parent | ad24d62882df33551205a049483714636c2d7982 (diff) | |
| download | cpython-45759a39246938997291ff0bc8e8d995dbc98300.zip cpython-45759a39246938997291ff0bc8e8d995dbc98300.tar.gz cpython-45759a39246938997291ff0bc8e8d995dbc98300.tar.bz2 | |
Issue #17095: merge from 3.4
Diffstat (limited to 'Modules/getpath.c')
| -rw-r--r-- | Modules/getpath.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index de803f8..11eece4 100644 --- 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. - */ - if (efound == -1) - bufsz += wcslen(argv0_path) + wcslen(L"Modules") + 2; 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); - wcscat(buf, argv0_path); - wcscat(buf, separator); - wcscat(buf, L"Modules"); - } /* And publish the results */ module_search_path = buf; |