MAINT: Fixes from static analysis

benchmarks/benchmarks/signal_filtering.py

@@ -62,12 +62,12 @@ def setup(self, n_samples, threads):
         self.chunks = np.array_split(self.data, threads)
 
     def time_sosfilt(self, n_samples, threads):
-        pool = ThreadPoolExecutor(max_workers=threads)
-        futures = []
-        for i in range(threads):
-            futures.append(pool.submit(sosfilt, self.filt, self.chunks[i]))
+        with ThreadPoolExecutor(max_workers=threads) as pool:
+            futures = []
+            for i in range(threads):
+                futures.append(pool.submit(sosfilt, self.filt, self.chunks[i]))
 
-        wait(futures)
+            wait(futures)
 
 
 class Sosfilt(Benchmark):

pavement.py

@@ -206,8 +206,9 @@ def release(options):
 def compute_md5(idirs):
     released = paver.path.path(idirs).listdir()
     checksums = []
-    for f in sorted(released):
-        m = md5(open(f, 'rb').read())
+    for fn in sorted(released):
+        with open(fn, 'rb') as f:
+            m = md5(f.read())
         checksums.append('%s  %s' % (m.hexdigest(), os.path.basename(f)))
 
     return checksums
@@ -217,8 +218,9 @@ def compute_sha256(idirs):
     # to verify the binaries instead of signing all binaries
     released = paver.path.path(idirs).listdir()
     checksums = []
-    for f in sorted(released):
-        m = sha256(open(f, 'rb').read())
+    for fn in sorted(released):
+        with open(fn, 'rb') as f:
+            m = sha256(f.read())
         checksums.append('%s  %s' % (m.hexdigest(), os.path.basename(f)))
 
     return checksums
@@ -267,9 +269,8 @@ def write_log_task(filename='Changelog'):
             stdout=subprocess.PIPE)
 
     out = st.communicate()[0].decode()
-    a = open(filename, 'w')
-    a.writelines(out)
-    a.close()
+    with open(filename, 'w') as a:
+        a.writelines(out)
 
 @task
 @cmdopts([('gpg_key=', 'g', 'GPG key to use for signing')])

scipy/optimize/_dual_annealing.py

@@ -407,9 +407,9 @@ def local_search(self, x, e):
         # Run local search from the given x location where energy value is e
         x_tmp = np.copy(x)
         mres = self.minimizer(self.func_wrapper.fun, x, **self.kwargs)
-        if 'njev' in mres.keys():
+        if 'njev' in mres:
             self.func_wrapper.ngev += mres.njev
-        if 'nhev' in mres.keys():
+        if 'nhev' in mres:
             self.func_wrapper.nhev += mres.nhev
         # Check if is valid value
         is_finite = np.all(np.isfinite(mres.x)) and np.isfinite(mres.fun)

scipy/special/_generate_pyx.py

@@ -457,7 +457,7 @@ def generate_fused_type(codes):
         Valid inputs to CY_TYPES (i.e. f, d, g, ...).
 
     """
-    cytypes = map(lambda x: CY_TYPES[x], codes)
+    cytypes = [CY_TYPES[x] for x in codes]
     name = codes + "_number_t"
     declaration = ["ctypedef fused " + name + ":"]
     for cytype in cytypes:

scipy/special/tests/test_sf_error.py

@@ -44,14 +44,14 @@ def _check_action(fun, args, action):
 def test_geterr():
     err = sc.geterr()
     for key, value in err.items():
-        assert_(key in _sf_error_code_map.keys())
+        assert_(key in _sf_error_code_map)
         assert_(value in _sf_error_actions)
 
 
 def test_seterr():
     entry_err = sc.geterr()
     try:
-        for category in _sf_error_code_map.keys():
+        for category, error_code in _sf_error_code_map.items():
             for action in _sf_error_actions:
                 geterr_olderr = sc.geterr()
                 seterr_olderr = sc.seterr(**{category: action})
@@ -61,9 +61,7 @@ def test_seterr():
                 geterr_olderr.pop(category)
                 newerr.pop(category)
                 assert_(geterr_olderr == newerr)
-                _check_action(_sf_error_test_function,
-                              (_sf_error_code_map[category],),
-                               action)
+                _check_action(_sf_error_test_function, (error_code,), action)
     finally:
         sc.seterr(**entry_err)
 
@@ -93,13 +91,11 @@ def test_errstate_cpp_basic():
 
 
 def test_errstate():
-    for category in _sf_error_code_map.keys():
+    for category, error_code in _sf_error_code_map.items():
         for action in _sf_error_actions:
             olderr = sc.geterr()
             with sc.errstate(**{category: action}):
-                _check_action(_sf_error_test_function,
-                              (_sf_error_code_map[category],),
-                              action)
+                _check_action(_sf_error_test_function, (error_code,), action)
             assert_equal(olderr, sc.geterr())
 
 

tools/refguide_check.py

@@ -281,8 +281,8 @@ def check_items(all_dict, names, deprecated, others, module_name, dots=True):
     output += "Objects in refguide: %i\n\n" % num_ref
 
     only_all, only_ref, missing = compare(all_dict, others, names, module_name)
-    dep_in_ref = set(only_ref).intersection(deprecated)
-    only_ref = set(only_ref).difference(deprecated)
+    dep_in_ref = only_ref.intersection(deprecated)
+    only_ref = only_ref.difference(deprecated)
 
     if len(dep_in_ref) > 0:
         output += "Deprecated objects in refguide::\n\n"