diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2016-12-09 21:55:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 21:55:09 -0500 |
commit | e00b9587052248486a9bf66c2ce95638c0d9817f (patch) | |
tree | 4f91c94f802aa32624c03e7e4e4d72697d547324 /numpy/distutils/misc_util.py | |
parent | 071f07030a4a05dc3b5bee4240d746ce39bae89b (diff) | |
parent | 7758aca6ae4c512165e3e7bc81a1d4b01649d4f4 (diff) | |
download | numpy-e00b9587052248486a9bf66c2ce95638c0d9817f.tar.gz |
Merge pull request #8360 from shadchin/drop_old_python
Drop old python
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r-- | numpy/distutils/misc_util.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 0070678d3..047282b84 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -12,6 +12,7 @@ import shutil import distutils from distutils.errors import DistutilsError +from distutils.msvccompiler import get_build_architecture try: from threading import local as tlocal except ImportError: @@ -2287,21 +2288,3 @@ def msvc_version(compiler): raise ValueError("Compiler instance is not msvc (%s)"\ % compiler.compiler_type) return compiler._MSVCCompiler__version - -if sys.version[:3] >= '2.5': - def get_build_architecture(): - from distutils.msvccompiler import get_build_architecture - return get_build_architecture() -else: - #copied from python 2.5.1 distutils/msvccompiler.py - def get_build_architecture(): - """Return the processor architecture. - - Possible results are "Intel", "Itanium", or "AMD64". - """ - prefix = " bit (" - i = sys.version.find(prefix) - if i == -1: - return "Intel" - j = sys.version.find(")", i) - return sys.version[i+len(prefix):j] |