Merge pull request numpy#14364 from hugovk/fix-flake8-2020

charris · web-flow · commit 766a88d2a1fc · 2019-08-28T17:43:47.000-06:00
MAINT: Fixes for prospective Python 3.10 and 4.0
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -464,7 +464,7 @@ def generate_config_h(ext, build_dir):
             moredefs.append(('HAVE_LDOUBLE_%s' % rep, 1))
 
             # Py3K check
-            if sys.version_info[0] == 3:
+            if sys.version_info[0] >= 3:
                 moredefs.append(('NPY_PY3K', 1))
 
             # Generate the config.h file from moredefs
diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py
@@ -38,7 +38,7 @@ def finalize_options(self):
                 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[:2])
         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
@@ -90,7 +90,7 @@ def finalize_options(self):
         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[:2])
             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/numpy/testing/_private/parameterized.py b/numpy/testing/_private/parameterized.py
@@ -45,11 +45,18 @@
 
 from unittest import TestCase
 
-PY3 = sys.version_info[0] == 3
 PY2 = sys.version_info[0] == 2
 
 
-if PY3:
+if PY2:
+    from types import InstanceType
+    lzip = zip
+    text_type = unicode
+    bytes_type = str
+    string_types = basestring,
+    def make_method(func, instance, type):
+        return MethodType(func, instance, type)
+else:
     # Python 3 doesn't have an InstanceType, so just use a dummy type.
     class InstanceType():
         pass
@@ -61,14 +68,6 @@ def make_method(func, instance, type):
         if instance is None:
             return func
         return MethodType(func, instance)
-else:
-    from types import InstanceType
-    lzip = zip
-    text_type = unicode
-    bytes_type = str
-    string_types = basestring,
-    def make_method(func, instance, type):
-        return MethodType(func, instance, type)
 
 _param = namedtuple("param", "args kwargs")
 
diff --git a/tools/npy_tempita/compat3.py b/tools/npy_tempita/compat3.py
@@ -5,7 +5,7 @@
 __all__ = ['PY3', 'b', 'basestring_', 'bytes', 'next', 'is_unicode',
            'iteritems']
 
-PY3 = True if sys.version_info[0] == 3 else False
+PY3 = True if sys.version_info[0] >= 3 else False
 
 if sys.version_info[0] < 3:
 
diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py
@@ -15,7 +15,7 @@
 
 # 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[:2])
 sys.path.insert(0, os.path.join("build", libDir))
 import Farray
 
