From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 10 Sep 2016 19:19:42 +0000 (-0700)
Subject: Closes #28059: Fixes test_platform to set PYTHONPATH for .pyd files
X-Git-Tag: v3.6.0b1~88^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=109bc3aa7345926c0df2b1bf97541c551f202893;p=python

Closes #28059: Fixes test_platform to set PYTHONPATH for .pyd files
---

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index ed18773326..18de110ecb 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -15,11 +15,18 @@ class PlatformTest(unittest.TestCase):
 
     @support.skip_unless_symlink
     def test_architecture_via_symlink(self): # issue3762
-        # On Windows, the EXE needs to know where pythonXY.dll is at so we have
-        # to add the directory to the path.
+        # On Windows, the EXE needs to know where pythonXY.dll and *.pyd is at
+        # so we add the directory to the path and PYTHONPATH.
         if sys.platform == "win32":
+            def restore_environ(old_env):
+                os.environ.clear()
+                os.environ.update(old_env)
+
+            self.addCleanup(restore_environ, dict(os.environ))
+
             os.environ["Path"] = "{};{}".format(
                 os.path.dirname(sys.executable), os.environ["Path"])
+            os.environ["PYTHONPATH"] = os.path.dirname(sys.executable)
 
         def get(python):
             cmd = [python, '-c',