summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-09-10 19:19:42 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-09-10 19:19:42 (GMT)
commit109bc3aa7345926c0df2b1bf97541c551f202893 (patch)
treed388dfc1b84781a935d995bca02bc9ebd2db9f08 /Lib
parent36820dd5a90724f68d4677e6eede29995541463c (diff)
downloadcpython-109bc3aa7345926c0df2b1bf97541c551f202893.zip
cpython-109bc3aa7345926c0df2b1bf97541c551f202893.tar.gz
cpython-109bc3aa7345926c0df2b1bf97541c551f202893.tar.bz2
Closes #28059: Fixes test_platform to set PYTHONPATH for .pyd files
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_platform.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index ed18773..18de110 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',