From 4fc9d84b544c2bf80265b037d9b7a0f88859cca5 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 10:00:49 -0700
Subject: [PATCH 1/6] Improves test_underpth_nosite_file to reveal why it
 fails.

---
 Lib/test/test_site.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 0924f01ba1adbf..150162279e6df6 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -547,12 +547,16 @@ def test_underpth_nosite_file(self):
         env = os.environ.copy()
         env['PYTHONPATH'] = 'from-env'
         env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH'))
-        rc = subprocess.call([exe_file, '-c',
-            'import sys; sys.exit(sys.flags.no_site and '
-            'len(sys.path) > 200 and '
-            'sys.path == %r)' % sys_path,
-            ], env=env)
-        self.assertTrue(rc, "sys.path is incorrect")
+        output = subprocess.check_output([exe_file, '-c',
+            'import sys; print("\\n".join(sys.path) if sys.flags.no_site else "")'
+        ], env=env, encoding='ansi')
+        actual_sys_path = output.rstrip().split('\n')
+        self.assert_(actual_sys_path, "sys.flags.no_site was False")
+        self.assertEqual(
+            actual_sys_path,
+            sys_path,
+            "sys.path is incorrect"
+        )
 
     def test_underpth_file(self):
         libpath = os.path.dirname(os.path.dirname(encodings.__file__))

From 9749c485193cc7fd90483a38c07746f84cd6c3d7 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 11:45:20 -0700
Subject: [PATCH 2/6] Enable building with Windows 10 SDK.

---
 PCbuild/python.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PCbuild/python.props b/PCbuild/python.props
index d6bfd0877e09df..00b75817e271a9 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -15,6 +15,8 @@
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath10)' != ''">v100</BasePlatformToolset>
 
+    <DefaultWindowsSDKVersion>$(WindowsSDKVersion)</DefaultWindowsSDKVersion>
+
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(BasePlatformToolset)</PlatformToolset>
     <ICCBuild>false</ICCBuild>
     <ICCBuild Condition="$(PlatformToolset.StartsWith(`Intel C++ Compiler`))">true</ICCBuild>

From 8432e02faba45d2e7aad7daf0141975f3196a1e6 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 14:08:17 -0700
Subject: [PATCH 3/6] Fix WinSDK detection

---
 PCbuild/python.props | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 00b75817e271a9..563487e0c366ff 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -15,8 +15,6 @@
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath10)' != ''">v100</BasePlatformToolset>
 
-    <DefaultWindowsSDKVersion>$(WindowsSDKVersion)</DefaultWindowsSDKVersion>
-
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(BasePlatformToolset)</PlatformToolset>
     <ICCBuild>false</ICCBuild>
     <ICCBuild Condition="$(PlatformToolset.StartsWith(`Intel C++ Compiler`))">true</ICCBuild>
@@ -65,6 +63,21 @@
     <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe>
   </PropertyGroup>
   
+  <PropertyGroup Condition="$(DefaultWindowsSDKVersion) == ''">
+    <!--
+    Attempt to select the latest installed WinSDK. If we don't find any, then we will
+    let the MSBuild targets determine which one it wants to use (typically the earliest
+    possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really
+    matter which WinSDK version we use.
+    -->
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="'$(OverrideVersion)' == ''">
     <!--
     Read version information from Include\patchlevel.h. The following properties are set:

From f1c3a880da00738c3d4b905b8f2c3accb1efa675 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 14:08:30 -0700
Subject: [PATCH 4/6] Fix initialization on Windows when a ._pth file exists.

---
 Python/pylifecycle.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 03601ead4db096..c8f61a3324d460 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -405,17 +405,18 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
     /* initialize builtin exceptions */
     _PyExc_Init(bimod);
 
-    sysmod = _PySys_BeginInit();
-    if (sysmod == NULL)
+	sysmod = _PySys_BeginInit();
+	if (sysmod == NULL)
         Py_FatalError("Py_Initialize: can't initialize sys");
-    interp->sysdict = PyModule_GetDict(sysmod);
-    if (interp->sysdict == NULL)
+	interp->sysdict = PyModule_GetDict(sysmod);
+	if (interp->sysdict == NULL)
         Py_FatalError("Py_Initialize: can't initialize sys dict");
     Py_INCREF(interp->sysdict);
-    if (_PySys_EndInit(interp->sysdict) < 0)
+	
+	PySys_SetPath(Py_GetPath());
+	if (_PySys_EndInit(interp->sysdict) < 0)
         Py_FatalError("Py_Initialize: can't initialize sys");
-    _PyImport_FixupBuiltin(sysmod, "sys");
-    PySys_SetPath(Py_GetPath());
+	_PyImport_FixupBuiltin(sysmod, "sys");
     PyDict_SetItemString(interp->sysdict, "modules",
                          interp->modules);
 

From d365107cf137ea41a8df4622ff66f2131581f16a Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 14:10:32 -0700
Subject: [PATCH 5/6] Fix tabs

---
 Python/pylifecycle.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index c8f61a3324d460..fdf0141762e30f 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -405,18 +405,18 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
     /* initialize builtin exceptions */
     _PyExc_Init(bimod);
 
-	sysmod = _PySys_BeginInit();
-	if (sysmod == NULL)
+    sysmod = _PySys_BeginInit();
+    if (sysmod == NULL)
         Py_FatalError("Py_Initialize: can't initialize sys");
-	interp->sysdict = PyModule_GetDict(sysmod);
-	if (interp->sysdict == NULL)
+    interp->sysdict = PyModule_GetDict(sysmod);
+    if (interp->sysdict == NULL)
         Py_FatalError("Py_Initialize: can't initialize sys dict");
     Py_INCREF(interp->sysdict);
-	
-	PySys_SetPath(Py_GetPath());
-	if (_PySys_EndInit(interp->sysdict) < 0)
+
+    PySys_SetPath(Py_GetPath());
+    if (_PySys_EndInit(interp->sysdict) < 0)
         Py_FatalError("Py_Initialize: can't initialize sys");
-	_PyImport_FixupBuiltin(sysmod, "sys");
+    _PyImport_FixupBuiltin(sysmod, "sys");
     PyDict_SetItemString(interp->sysdict, "modules",
                          interp->modules);
 

From 092f1cd66f836392b14b68e7e3ba9fced08287b6 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 23 May 2017 14:51:07 -0700
Subject: [PATCH 6/6] Adds comment about Py_GetPath call.

---
 Python/pylifecycle.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index fdf0141762e30f..d2b277748fb130 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -413,6 +413,10 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)
         Py_FatalError("Py_Initialize: can't initialize sys dict");
     Py_INCREF(interp->sysdict);
 
+    /* GetPath may initialize state that _PySys_EndInit locks
+       in, and so has to be called first.
+       
+       Hopefully one day Eric Snow will fix this. */
     PySys_SetPath(Py_GetPath());
     if (_PySys_EndInit(interp->sysdict) < 0)
         Py_FatalError("Py_Initialize: can't initialize sys");