From 6345d21c24436abbeb1818bc0f94a1ff9e0bb019 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 24 Oct 2017 10:55:35 -0400 Subject: [PATCH 1/3] TEST: Check only relevant warnings --- nibabel/tests/test_image_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nibabel/tests/test_image_api.py b/nibabel/tests/test_image_api.py index d71fbcdb30..be270795e9 100644 --- a/nibabel/tests/test_image_api.py +++ b/nibabel/tests/test_image_api.py @@ -377,9 +377,9 @@ def validate_shape(self, imaker, params): def validate_shape_deprecated(self, imaker, params): # Check deprecated get_shape API + img = imaker() with clear_and_catch_warnings() as w: warnings.simplefilter('always', DeprecationWarning) - img = imaker() assert_equal(img.get_shape(), params['shape']) assert_equal(len(w), 1) From 0471ffbca12ff30ecb5fc688480dda85a9e81a4f Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 24 Oct 2017 11:00:31 -0400 Subject: [PATCH 2/3] STY: Narrow exception check --- nibabel/ecat.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nibabel/ecat.py b/nibabel/ecat.py index 6b193acdcc..3c0957e11d 100644 --- a/nibabel/ecat.py +++ b/nibabel/ecat.py @@ -468,13 +468,13 @@ def get_series_framenumbers(mlist): mlist_nframes = len(frames_order) trueframenumbers = np.arange(nframes - mlist_nframes, nframes) frame_dict = {} - try: - for frame_stored, (true_order, _) in frames_order.items(): - # frame as stored in file -> true number in series + for frame_stored, (true_order, _) in frames_order.items(): + # frame as stored in file -> true number in series + try: frame_dict[frame_stored] = trueframenumbers[true_order] + 1 - return frame_dict - except: - raise IOError('Error in header or mlist order unknown') + except IndexError: + raise IOError('Error in header or mlist order unknown') + return frame_dict def read_subheaders(fileobj, mlist, endianness): From d0c9e3662e8ea21de701e2124326d8bae560c263 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 24 Oct 2017 11:05:25 -0400 Subject: [PATCH 3/3] STY: No bare excepts --- nibabel/benchmarks/bench_arrayproxy_slicing.py | 2 +- nibabel/tripwire.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nibabel/benchmarks/bench_arrayproxy_slicing.py b/nibabel/benchmarks/bench_arrayproxy_slicing.py index a824822d3c..321a0779d5 100644 --- a/nibabel/benchmarks/bench_arrayproxy_slicing.py +++ b/nibabel/benchmarks/bench_arrayproxy_slicing.py @@ -191,7 +191,7 @@ def testfunc(): data[:, 1] = [r[4] for r in results] try: data[:, 2] = [r[3] / r[4] for r in results] - except: + except ZeroDivisionError: data[:, 2] = np.nan data[:, 3] = [r[5] - r[6] for r in results] diff --git a/nibabel/tripwire.py b/nibabel/tripwire.py index 3850281587..e31cfe7258 100644 --- a/nibabel/tripwire.py +++ b/nibabel/tripwire.py @@ -24,7 +24,7 @@ def is_tripwire(obj): obj.any_attribute except TripWireError: return True - except: + except Exception: pass return False