commit 1e4b73fcf75a27c7e9020ecb8e58ffc274909e5a
author Serhiy Storchaka <storchaka@gmail.com> Fri Nov 11 12:11:55 2016 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Fri Nov 11 12:11:55 2016 +0200
tree 3097523e0cb7f3cc50fb8b16cc167d5773f4e598
parent ac33bd7d1d55fbf82a72bbc8d21ebf05202c65b2

Issue #19398: Extra slash no longer added to sys.path components in case of
empty compile-time PYTHONPATH components.  This fixes some tests in -S or -I
modes.

Modules/getpath.c

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 18b161c..c42ce31 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -597,7 +597,10 @@
 
             if (defpath[0] != SEP) {
                 strcat(buf, prefix);
-                strcat(buf, separator);
+                if (prefixsz >= 2 && prefix[prefixsz - 2] != SEP &&
+                    defpath[0] != (delim ? DELIM : L'\0')) {  /* not empty */
+                    strcat(buf, separator);
+                }
             }
 
             if (delim) {