summaryrefslogtreecommitdiff
path: root/numpy/distutils/misc_util.py
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@gmail.com>2018-10-20 11:34:57 +1300
committerGitHub <noreply@github.com>2018-10-20 11:34:57 +1300
commit2be154408c6a088a296da3cad274473ea7d03317 (patch)
tree7e176c2c25b7bd7429da57cd1cb15777b7bc4fcc /numpy/distutils/misc_util.py
parented64256267fce0cf6bcbbaa9afa4c44f6ce8091b (diff)
parent8589e8d035bdd9a8f67ab2f30ea5cb63d9acf0ba (diff)
downloadnumpy-2be154408c6a088a296da3cad274473ea7d03317.tar.gz
Merge pull request #12209 from anntzer/get_build_arch
MAINT: delay import of distutils.msvccompiler to avoid warning on non-Windows.
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r--numpy/distutils/misc_util.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 073e841e8..eba0d9ba1 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -13,7 +13,6 @@ import multiprocessing
import distutils
from distutils.errors import DistutilsError
-from distutils.msvccompiler import get_build_architecture
try:
from threading import local as tlocal
except ImportError:
@@ -2336,3 +2335,9 @@ def msvc_version(compiler):
raise ValueError("Compiler instance is not msvc (%s)"\
% compiler.compiler_type)
return compiler._MSVCCompiler__version
+
+def get_build_architecture():
+ # Importing distutils.msvccompiler triggers a warning on non-Windows
+ # systems, so delay the import to here.
+ from distutils.msvccompiler import get_build_architecture
+ return get_build_architecture()