diff options
| author | Hugo <hugovk@users.noreply.github.com> | 2019-08-26 17:49:00 +0300 |
|---|---|---|
| committer | Hugo <hugovk@users.noreply.github.com> | 2019-08-26 18:22:55 +0300 |
| commit | e7c1f8e789d8ccea6034f791393a2122e1237886 (patch) | |
| tree | 093a02e7e309288ce3d22f7081f2158d486af301 | |
| parent | dc089026b4ad0d2d9ea992c7f1b9b5e716dd82cd (diff) | |
| download | numpy-e7c1f8e789d8ccea6034f791393a2122e1237886.tar.gz | |
BUG: Fix for Python 3.10
| -rw-r--r-- | numpy/distutils/command/build.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/build_src.py | 2 | ||||
| -rwxr-xr-x | tools/swig/test/testFarray.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index 3d7101582..e0d1c8413 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -38,7 +38,7 @@ class build(old_build): raise ValueError("--parallel/-j argument must be an integer") build_scripts = self.build_scripts old_build.finalize_options(self) - plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3]) + plat_specifier = ".{}-{}.{}".format(get_platform(), *sys.version_info) if build_scripts is None: self.build_scripts = os.path.join(self.build_base, 'scripts' + plat_specifier) diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index 41bb01da5..98bde38ac 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -90,7 +90,7 @@ class build_src(build_ext.build_ext): self.data_files = self.distribution.data_files or [] if self.build_src is None: - plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3]) + plat_specifier = ".{}-{}.{}".format(get_platform(), *sys.version_info) self.build_src = os.path.join(self.build_base, 'src'+plat_specifier) # py_modules_dict is used in build_py.find_package_modules diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py index 0037dc9b3..ea5a06257 100755 --- a/tools/swig/test/testFarray.py +++ b/tools/swig/test/testFarray.py @@ -15,7 +15,7 @@ else: BadListError = ValueError # Add the distutils-generated build directory to the python search path and then # import the extension module -libDir = "lib.%s-%s" % (get_platform(), sys.version[:3]) +libDir = "lib.{}-{}.{}".format(get_platform(), *sys.version_info) sys.path.insert(0, os.path.join("build", libDir)) import Farray |