From 47a0ed5924ea05ac58a9a36f60670b79e76c6273 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 25 Aug 2022 17:41:38 -0400 Subject: [PATCH] Revert "Windows: Improve Python 3.8+ module check on Windows" This reverts commit 99ad11bd9c3249f548dda0b275d9f8dd1b3f6d14. This breaks working setups in conda. It is either wrong or incomplete and thus cannot be used. Fixes #10737 --- mesonbuild/modules/python.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 9b50de418..6c5fcfe7c 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -765,22 +765,10 @@ class PythonModule(ExtensionModule): found_modules: T.List[str] = [] missing_modules: T.List[str] = [] if python.found() and want_modules: - # Python 3.8.x or later require add_dll_directory() to be called on Windows if - # the needed modules require external DLLs that are not bundled with the modules. - # Simplify things by calling add_dll_directory() on the paths in %PATH% - add_paths_cmd = '' - if hasattr(os, 'add_dll_directory'): - add_paths_cmds = [] - paths = os.environ['PATH'].split(os.pathsep) - for path in paths: - if path != '' and os.path.isdir(path): - add_paths_cmds.append(f'os.add_dll_directory({path!r})') - add_paths_cmd = 'import os;' + ';'.join(reversed(add_paths_cmds)) + ';' - for mod in want_modules: p, *_ = mesonlib.Popen_safe( python.command + - ['-c', f'{add_paths_cmd}import {mod}']) + ['-c', f'import {mod}']) if p.returncode != 0: missing_modules.append(mod) else: