small cleaning after review

Author: djarecka

nibabel/tests/test_arraywriters.py

@@ -640,7 +640,7 @@ def test_writer_maker():
     assert (aw.slope, aw.inter) == (1, 0)
     aw.calc_scale()
     slope, inter = aw.slope, aw.inter
-    assert (slope, inter) != (1, 0)
+    assert not (slope, inter) == (1, 0)
     # Should run by default
     aw = make_array_writer(arr, np.int16)
     assert (aw.slope, aw.inter) == (slope, inter)
@@ -704,7 +704,7 @@ def test_int_int_slope():
                     aw = SlopeArrayWriter(arr, out_dt)
                 except ScalingError:
                     continue
-                assert aw.slope != 0
+                assert not aw.slope == 0
                 arr_back_sc = round_trip(aw)
                 # integer allclose
                 adiff = int_abs(arr - arr_back_sc)

nibabel/tests/test_casting.py

@@ -120,7 +120,7 @@ def test_casting():
             # Confirm input array is not modified
             nans = np.isnan(farr)
             assert_array_equal(nans, np.isnan(farr_orig))
-            assert_array_equal(farr[nans is False], farr_orig[nans is False])
+            assert_array_equal(farr[nans == False], farr_orig[nans == False])
     # Test scalars work and return scalars
     assert_array_equal(float_to_int(np.float32(0), np.int16), [0])
     # Test scalar nan OK

nibabel/tests/test_deprecator.py

@@ -34,9 +34,9 @@ def test__add_dep_doc():
     assert _add_dep_doc('bar\n\n', 'foo') == 'bar\n\nfoo\n'
     assert _add_dep_doc('bar\n    \n', 'foo') == 'bar\n\nfoo\n'
     assert (_add_dep_doc(' bar\n\nSome explanation', 'foo\nbaz') ==
-                 ' bar\n\nfoo\nbaz\n\nSome explanation\n')
+            ' bar\n\nfoo\nbaz\n\nSome explanation\n')
     assert (_add_dep_doc(' bar\n\n  Some explanation', 'foo\nbaz') ==
-                 ' bar\n  \n  foo\n  baz\n  \n  Some explanation\n')
+            ' bar\n  \n  foo\n  baz\n  \n  Some explanation\n')
 
 
 class CustomError(Exception):
@@ -73,28 +73,24 @@ def test_dep_func(self):
             assert func() is None
         assert func.__doc__ == 'foo\n'
         func = dec('foo')(func_doc)
-        with clear_and_catch_warnings(modules=[_OWN_MODULE]) as w:
-            warnings.simplefilter('always')
+        with pytest.deprecated_call() as w:
             assert func(1) is None
             assert len(w) == 1
         assert func.__doc__ == 'A docstring\n\nfoo\n'
         func = dec('foo')(func_doc_long)
-        with clear_and_catch_warnings(modules=[_OWN_MODULE]) as w:
-            warnings.simplefilter('always')
+        with pytest.deprecated_call() as w:
             assert func(1, 2) is None
             assert len(w) == 1
         assert func.__doc__ == 'A docstring\n   \n   foo\n   \n   Some text\n'
 
         # Try some since and until versions
         func = dec('foo', '1.1')(func_no_doc)
         assert func.__doc__ == 'foo\n\n* deprecated from version: 1.1\n'
-        with clear_and_catch_warnings(modules=[_OWN_MODULE]) as w:
-            warnings.simplefilter('always')
+        with pytest.deprecated_call() as w:
             assert func() is None
             assert len(w) == 1
         func = dec('foo', until='99.4')(func_no_doc)
-        with clear_and_catch_warnings(modules=[_OWN_MODULE]) as w:
-            warnings.simplefilter('always')
+        with pytest.deprecated_call() as w:
             assert func() is None
             assert len(w) == 1
         assert (func.__doc__ ==
@@ -104,22 +100,22 @@ def test_dep_func(self):
         with pytest.raises(ExpiredDeprecationError):
             func()
         assert (func.__doc__ ==
-                    'foo\n\n* Raises {} as of version: 1.8\n'
-                    .format(ExpiredDeprecationError))
+                'foo\n\n* Raises {} as of version: 1.8\n'
+                .format(ExpiredDeprecationError))
         func = dec('foo', '1.2', '1.8')(func_no_doc)
         with pytest.raises(ExpiredDeprecationError):
             func()
         assert (func.__doc__ ==
-                    'foo\n\n* deprecated from version: 1.2\n'
-                    '* Raises {} as of version: 1.8\n'
-                    .format(ExpiredDeprecationError))
+                'foo\n\n* deprecated from version: 1.2\n'
+                '* Raises {} as of version: 1.8\n'
+                .format(ExpiredDeprecationError))
         func = dec('foo', '1.2', '1.8')(func_doc_long)
         assert (func.__doc__ ==
-                    'A docstring\n   \n   foo\n   \n'
-                    '   * deprecated from version: 1.2\n'
-                    '   * Raises {} as of version: 1.8\n   \n'
-                    '   Some text\n'
-                    .format(ExpiredDeprecationError))
+                'A docstring\n   \n   foo\n   \n'
+                '   * deprecated from version: 1.2\n'
+                '   * Raises {} as of version: 1.8\n   \n'
+                '   Some text\n'
+                .format(ExpiredDeprecationError))
         with pytest.raises(ExpiredDeprecationError):
             func()
 

nibabel/tests/test_ecat.py

@@ -21,7 +21,7 @@
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 
-from ..testing_pytest import data_path, suppress_warnings, clear_and_catch_warnings
+from ..testing_pytest import data_path, suppress_warnings
 from ..tmpdirs import InTemporaryDirectory
 
 from .test_wrapstruct import _TestWrapStructBase
@@ -271,8 +271,7 @@ def test_mlist_regression(self):
 
 def test_from_filespec_deprecation():
     # Check from_filespec raises Deprecation
-    with clear_and_catch_warnings() as w:
-        warnings.simplefilter('always', DeprecationWarning)
+    with pytest.deprecated_call() as w:
         # No warning for standard load
         img_loaded = EcatImage.load(ecat_file)
         assert len(w) == 0

nibabel/tests/test_nifti1.py

@@ -1131,10 +1131,10 @@ def test_extension_basics():
 def test_ext_eq():
     ext = Nifti1Extension('comment', '123')
     assert ext == ext
-    assert ext == ext
+    assert not ext != ext
     ext2 = Nifti1Extension('comment', '124')
     assert ext != ext2
-    assert ext != ext2
+    assert not ext == ext2
 
 
 def test_extension_codes():
@@ -1148,7 +1148,7 @@ def test_extension_list():
     assert ext_c0 == ext_c1
     ext = Nifti1Extension('comment', '123')
     ext_c1.append(ext)
-    assert ext_c0 != ext_c1
+    assert not ext_c0 == ext_c1
     ext_c0.append(ext)
     assert ext_c0 == ext_c1
 

nibabel/tests/test_spatialimages.py

@@ -379,10 +379,10 @@ def test_get_data(self):
             img[0, 0, 0]
         # Make sure the right message gets raised:
         assert (str(exception_manager.value) ==
-                     "Cannot slice image objects; consider using "
-                     "`img.slicer[slice]` to generate a sliced image (see "
-                     "documentation for caveats) or slicing image array data "
-                     "with `img.dataobj[slice]` or `img.get_fdata()[slice]`")
+                "Cannot slice image objects; consider using "
+                "`img.slicer[slice]` to generate a sliced image (see "
+                "documentation for caveats) or slicing image array data "
+                "with `img.dataobj[slice]` or `img.get_fdata()[slice]`")
         assert in_data is img.dataobj
         with pytest.deprecated_call():
             out_data = img.get_data()
@@ -648,7 +648,10 @@ def test_load_mmap(self):
 
 
 def test_header_deprecated():
-    with pytest.deprecated_call():
+    with pytest.deprecated_call() as w:
         class MyHeader(Header):
             pass
-        MyHeader()
+
+        assert len(w) == 0
+        MyHeader()
+        assert len(w) == 1

nibabel/tests/test_spm99analyze.py

@@ -146,8 +146,8 @@ def test_origin_checks(self):
         fhdr, message, raiser = self.log_chk(hdr, 20)
         assert fhdr == hdr
         assert (message == 'very large origin values '
-                     'relative to dims; leaving as set, '
-                     'ignoring for affine')
+                           'relative to dims; leaving as set, '
+                           'ignoring for affine')
         pytest.raises(*raiser)
         # diagnose binary block
         dxer = self.header_class.diagnose_binaryblock

nibabel/tests/test_volumeutils.py

@@ -57,8 +57,7 @@
                            assert_array_equal)
 import pytest
 
-from ..testing_pytest import (assert_dt_equal, assert_allclose_safely,
-                              suppress_warnings, clear_and_catch_warnings)
+from ..testing_pytest import assert_dt_equal, assert_allclose_safely, suppress_warnings
 
 #: convenience variables for numpy types
 FLOAT_TYPES = np.sctypes['float']
@@ -1019,8 +1018,7 @@ def test_fname_ext_ul_case():
 def test_allopen():
     # This import into volumeutils is for compatibility.  The code is the
     # ``openers`` module.
-    with clear_and_catch_warnings() as w:
-        warnings.filterwarnings('once', category=DeprecationWarning)
+    with pytest.deprecated_call() as w:
         # Test default mode is 'rb'
         fobj = allopen(__file__)
         # Check we got the deprecation warning