Merge remote-tracking branch 'upstream/master' into fix78-c+11std

esutil/numpy_util.py

@@ -764,8 +764,10 @@ def remove_fields(arr, rmnames):
     REVISION HISTORY:
         Created 2007, Erin Sheldon, NYU.
     """
-    if type(rmnames) != list:
+
+    if not isinstance(rmnames, list):
         rmnames = [rmnames]
+
     descr = arr.dtype.descr
     new_descr = []
     for d in descr:
@@ -827,7 +829,7 @@ def add_fields(arr, add_dtype_or_descr, defaults=None):
 
     # See if the user has indicated default values for the new fields
     if defaults is not None:
-        if type(defaults) != list:
+        if not isinstance(defaults, list):
             defaults = [defaults]
         if len(defaults) != len(add_descr):
             raise ValueError("defaults must be same length as new dtype")
@@ -923,10 +925,12 @@ def copy_fields_by_name(arr, names, vals):
         Created 2007, Erin Sheldon, NYU.
 
     """
-    if type(names) != list and type(names) != np.ndarray:
+    if not isinstance(names, (list, np.ndarray)):
         names = [names]
-    if type(vals) != list and type(vals) != np.ndarray:
+
+    if not isinstance(vals, (list, np.ndarray)):
         vals = [vals]
+
     if len(names) != len(vals):
         raise ValueError("Length of names and values must be the same")
 

esutil/wcsutil.py

@@ -908,7 +908,7 @@ def ConvertWCS(self, wcs_in):
         # Convert the wcs to a local dictionary
 
         wcs = {}
-        if type(wcs_in) == np.ndarray or hasattr(wcs_in, "dtype"):
+        if isinstance(wcs_in, np.ndarray) or hasattr(wcs_in, "dtype"):
             if wcs_in.dtype.fields is None:
                 raise ValueError("wcs array must have fields")
 

setup.py

@@ -1,6 +1,4 @@
 import os
-import time
-from sys import stdout
 from glob import glob
 import platform
 import tempfile
@@ -286,7 +284,7 @@ def build_extensions(self):
     packages=packages,
     cmdclass={"build_ext": MyBuilder},
     ext_modules=ext_modules,
-    install_requires=['numpy','scipy'],
+    install_requires=['numpy', 'scipy'],
 )
 
 # If we get to here, then all was fine.  Go ahead and delete the files in the