Merge pull request #1288 from DimitriPapadopoulos/repo-review

MNT: Apply Repo-Review suggestions

Author: effigies

nibabel/_compression.py

@@ -17,7 +17,7 @@
 from .optpkg import optional_package
 
 if ty.TYPE_CHECKING:  # pragma: no cover
-    import indexed_gzip  # type: ignore
+    import indexed_gzip  # type: ignore[import-not-found]
     import pyzstd
 
     HAVE_INDEXED_GZIP = True
@@ -40,7 +40,7 @@
 if HAVE_INDEXED_GZIP:
     COMPRESSED_FILE_LIKES += (indexed_gzip.IndexedGzipFile,)
     COMPRESSION_ERRORS += (indexed_gzip.ZranError,)
-    from indexed_gzip import IndexedGzipFile  # type: ignore
+    from indexed_gzip import IndexedGzipFile  # type: ignore[import-not-found]
 else:
     IndexedGzipFile = gzip.GzipFile
 

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -26,7 +26,7 @@
 
 # if memory_profiler is installed, we get memory usage results
 try:
-    from memory_profiler import memory_usage  # type: ignore
+    from memory_profiler import memory_usage  # type: ignore[import-not-found]
 except ImportError:
     memory_usage = None
 

nibabel/cmdline/dicomfs.py

@@ -25,7 +25,7 @@ class dummy_fuse:
 
 
 try:
-    import fuse  # type: ignore
+    import fuse  # type: ignore[import-not-found]
 
     uid = os.getuid()
     gid = os.getgid()

nibabel/externals/conftest.py

@@ -6,7 +6,7 @@
     import os
     from contextlib import contextmanager
 
-    @contextmanager  # type: ignore
+    @contextmanager  # type: ignore[no-redef]
     def _chdir(path):
         cwd = os.getcwd()
         os.chdir(path)

nibabel/minc2.py

@@ -163,7 +163,7 @@ class Minc2Image(Minc1Image):
     def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
         # Import of h5py might take awhile for MPI-enabled builds
         # So we are importing it here "on demand"
-        import h5py  # type: ignore
+        import h5py  # type: ignore[import-not-found]
 
         holder = file_map['image']
         if holder.filename is None:

nibabel/parrec.py

@@ -1338,7 +1338,7 @@ def from_filename(
             strict_sort=strict_sort,
         )
 
-    load = from_filename  # type: ignore
+    load = from_filename  # type: ignore[assignment]
 
 
 load = PARRECImage.from_filename

nibabel/pydicom_compat.py

@@ -42,7 +42,7 @@
 
 if have_dicom:
     # Values not imported by default
-    import pydicom.values  # type: ignore
+    import pydicom.values  # type: ignore[import-not-found]
     from pydicom.dicomio import dcmread as read_file  # noqa:F401
     from pydicom.sequence import Sequence  # noqa:F401
 

nibabel/spm99analyze.py

@@ -275,7 +275,7 @@ def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
             contents = matf.read()
         if len(contents) == 0:
             return ret
-        import scipy.io as sio  # type: ignore
+        import scipy.io as sio  # type: ignore[import-not-found]
 
         mats = sio.loadmat(BytesIO(contents))
         if 'mat' in mats:  # this overrides a 'M', and includes any flip

nibabel/tmpdirs.py

@@ -15,7 +15,7 @@
     from contextlib import chdir as _chdir
 except ImportError:  # PY310
 
-    @contextmanager  # type: ignore
+    @contextmanager  # type: ignore[no-redef]
     def _chdir(path):
         cwd = os.getcwd()
         os.chdir(path)

nibabel/xmlutils.py

@@ -32,7 +32,7 @@ def to_xml(self, enc='utf-8', **kwargs) -> bytes:
             Additional keyword arguments to :func:`xml.etree.ElementTree.tostring`.
         """
         ele = self._to_xml_element()
-        return b'' if ele is None else tostring(ele, enc, **kwargs)
+        return tostring(ele, enc, **kwargs)
 
 
 class XmlBasedHeader(FileBasedHeader, XmlSerializable):