diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-06-29 13:32:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-29 13:32:49 -0600 |
| commit | e70d12f2a433a7002bf416ad854742d61dd45d92 (patch) | |
| tree | 28361d4bb95b3504d524fcc6e3376039ebc1fc4c /numpy | |
| parent | c0a333e9c9ee3d96acd3e038daf65974462d8baa (diff) | |
| parent | 929b25cd9437cf0bc8cb3bb8165d711fb680293b (diff) | |
| download | numpy-e70d12f2a433a7002bf416ad854742d61dd45d92.tar.gz | |
Merge pull request #11449 from charris/revert-10229
BUG: Revert #10229 to fix DLL loads on Windows.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/misc_util.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 186ed949d..8305aeae5 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -2300,19 +2300,9 @@ import sys extra_dll_dir = os.path.join(os.path.dirname(__file__), '.libs') -if os.path.isdir(extra_dll_dir) and sys.platform == 'win32': - try: - from ctypes import windll, c_wchar_p - _AddDllDirectory = windll.kernel32.AddDllDirectory - _AddDllDirectory.argtypes = [c_wchar_p] - # Needed to initialize AddDllDirectory modifications - windll.kernel32.SetDefaultDllDirectories(0x1000) - except AttributeError: - def _AddDllDirectory(dll_directory): - os.environ.setdefault('PATH', '') - os.environ['PATH'] += os.pathsep + dll_directory - - _AddDllDirectory(extra_dll_dir) +if sys.platform == 'win32' and os.path.isdir(extra_dll_dir): + os.environ.setdefault('PATH', '') + os.environ['PATH'] += os.pathsep + extra_dll_dir """) |