From 62e32d6352e318ed03eb519aedbc975b772114b5 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 11 Nov 2016 12:05:01 +0200
Subject: 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Modules/getpath.c')

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 18deb60dfa..c438b8e65b 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -762,7 +762,10 @@ calculate_path(void)
 
         if (defpath[0] != SEP) {
             wcscat(buf, prefix);
-            wcscat(buf, separator);
+            if (prefixsz >= 2 && prefix[prefixsz - 2] != SEP &&
+                defpath[0] != (delim ? DELIM : L'\0')) {  /* not empty */
+                wcscat(buf, separator);
+            }
         }
 
         if (delim) {
-- 
cgit v1.2.1