[Python-checkins] cpython (merge 3.4 -> default): Issue #17095: merge from 3.4

[ned.deily]

http://hg.python.org/cpython/rev/d3939f602e1f
changeset:   92428:d3939f602e1f
parent:      92426:9d54903a84b5
parent:      92427:781454f792c4
user:        Ned Deily <nad at acm.org>
date:        Sun Sep 14 19:21:05 2014 -0700
summary:
  Issue #17095: merge from 3.4

files:
  Modules/getpath.c |  14 --------------
  1 files changed, 0 insertions(+), 14 deletions(-)


diff --git a/Modules/getpath.c b/Modules/getpath.c
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -734,11 +734,6 @@
 
     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 @@
 
     /* 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;

-- 
Repository URL: http://hg.python.org/cpython