sty: Apply ruff fix for Self-returning methods

Author: effigies

nibabel/dataobj_images.py

@@ -13,6 +13,7 @@
 import typing as ty
 
 import numpy as np
+from typing_extensions import Self
 
 from .deprecated import deprecate_with_version
 from .filebasedimages import FileBasedHeader, FileBasedImage
@@ -427,12 +428,12 @@ def ndim(self) -> int:
 
     @classmethod
     def from_file_map(
-        klass: type[ArrayImgT],
+        klass,
         file_map: FileMap,
         *,
         mmap: bool | ty.Literal['c', 'r'] = True,
         keep_file_open: bool | None = None,
-    ) -> ArrayImgT:
+    ) -> Self:
         """Class method to create image from mapping in ``file_map``
 
         Parameters
@@ -466,12 +467,12 @@ def from_file_map(
 
     @classmethod
     def from_filename(
-        klass: type[ArrayImgT],
+        klass,
         filename: FileSpec,
         *,
         mmap: bool | ty.Literal['c', 'r'] = True,
         keep_file_open: bool | None = None,
-    ) -> ArrayImgT:
+    ) -> Self:
         """Class method to create image from filename `filename`
 
         Parameters

nibabel/filebasedimages.py

@@ -15,6 +15,8 @@
 from copy import deepcopy
 from urllib import request
 
+from typing_extensions import Self
+
 from ._compression import COMPRESSION_ERRORS
 from .fileholders import FileHolder, FileMap
 from .filename_parser import TypesFilenamesError, _stringify_path, splitext_addext, types_filenames
@@ -39,7 +41,7 @@ class FileBasedHeader:
     """Template class to implement header protocol"""
 
     @classmethod
-    def from_header(klass: type[HdrT], header: FileBasedHeader | ty.Mapping | None = None) -> HdrT:
+    def from_header(klass, header: FileBasedHeader | ty.Mapping | None = None) -> Self:
         if header is None:
             return klass()
         # I can't do isinstance here because it is not necessarily true
@@ -53,7 +55,7 @@ def from_header(klass: type[HdrT], header: FileBasedHeader | ty.Mapping | None =
         )
 
     @classmethod
-    def from_fileobj(klass: type[HdrT], fileobj: io.IOBase) -> HdrT:
+    def from_fileobj(klass, fileobj: io.IOBase) -> Self:
         raise NotImplementedError
 
     def write_to(self, fileobj: io.IOBase) -> None:
@@ -65,7 +67,7 @@ def __eq__(self, other: object) -> bool:
     def __ne__(self, other: object) -> bool:
         return not self == other
 
-    def copy(self: HdrT) -> HdrT:
+    def copy(self) -> Self:
         """Copy object to independent representation
 
         The copy should not be affected by any changes to the original
@@ -245,12 +247,12 @@ def set_filename(self, filename: str) -> None:
         self.file_map = self.__class__.filespec_to_file_map(filename)
 
     @classmethod
-    def from_filename(klass: type[ImgT], filename: FileSpec) -> ImgT:
+    def from_filename(klass, filename: FileSpec) -> Self:
         file_map = klass.filespec_to_file_map(filename)
         return klass.from_file_map(file_map)
 
     @classmethod
-    def from_file_map(klass: type[ImgT], file_map: FileMap) -> ImgT:
+    def from_file_map(klass, file_map: FileMap) -> Self:
         raise NotImplementedError
 
     @classmethod
@@ -360,7 +362,7 @@ def instance_to_filename(klass, img: FileBasedImage, filename: FileSpec) -> None
         img.to_filename(filename)
 
     @classmethod
-    def from_image(klass: type[ImgT], img: FileBasedImage) -> ImgT:
+    def from_image(klass, img: FileBasedImage) -> Self:
         """Class method to create new instance of own class from `img`
 
         Parameters
@@ -540,7 +542,7 @@ def _filemap_from_iobase(klass, io_obj: io.IOBase) -> FileMap:
         return klass.make_file_map({klass.files_types[0][0]: io_obj})
 
     @classmethod
-    def from_stream(klass: type[StreamImgT], io_obj: io.IOBase) -> StreamImgT:
+    def from_stream(klass, io_obj: io.IOBase) -> Self:
         """Load image from readable IO stream
 
         Convert to BytesIO to enable seeking, if input stream is not seekable
@@ -567,7 +569,7 @@ def to_stream(self, io_obj: io.IOBase, **kwargs) -> None:
         self.to_file_map(self._filemap_from_iobase(io_obj), **kwargs)
 
     @classmethod
-    def from_bytes(klass: type[StreamImgT], bytestring: bytes) -> StreamImgT:
+    def from_bytes(klass, bytestring: bytes) -> Self:
         """Construct image from a byte string
 
         Class method
@@ -598,9 +600,7 @@ def to_bytes(self, **kwargs) -> bytes:
         return bio.getvalue()
 
     @classmethod
-    def from_url(
-        klass: type[StreamImgT], url: str | request.Request, timeout: float = 5
-    ) -> StreamImgT:
+    def from_url(klass, url: str | request.Request, timeout: float = 5) -> Self:
         """Retrieve and load an image from a URL
 
         Class method

nibabel/gifti/gifti.py

@@ -867,7 +867,7 @@ def to_xml(self, enc='utf-8', *, mode='strict', **kwargs) -> bytes:
                 if arr.datatype not in GIFTI_DTYPES:
                     arr = copy(arr)
                     # TODO: Better typing for recoders
-                    dtype = cast(np.dtype, data_type_codes.dtype[arr.datatype])
+                    dtype = cast('np.dtype', data_type_codes.dtype[arr.datatype])
                     if np.issubdtype(dtype, np.floating):
                         arr.datatype = data_type_codes['float32']
                     elif np.issubdtype(dtype, np.integer):

nibabel/openers.py

@@ -68,7 +68,7 @@ def __init__(
             if filename is None:
                 raise TypeError('Must define either fileobj or filename')
             # Cast because GzipFile.myfileobj has type io.FileIO while open returns ty.IO
-            fileobj = self.myfileobj = ty.cast(io.FileIO, open(filename, modestr))
+            fileobj = self.myfileobj = ty.cast('io.FileIO', open(filename, modestr))
         super().__init__(
             filename='',
             mode=modestr,

nibabel/spatialimages.py

@@ -137,6 +137,7 @@
 from typing import Literal
 
 import numpy as np
+from typing_extensions import Self
 
 from .casting import sctypes_aliases
 from .dataobj_images import DataobjImage
@@ -203,9 +204,9 @@ def __init__(
 
     @classmethod
     def from_header(
-        klass: type[SpatialHdrT],
+        klass,
         header: SpatialProtocol | FileBasedHeader | ty.Mapping | None = None,
-    ) -> SpatialHdrT:
+    ) -> Self:
         if header is None:
             return klass()
         # I can't do isinstance here because it is not necessarily true
@@ -227,7 +228,7 @@ def __eq__(self, other: object) -> bool:
             )
         return NotImplemented
 
-    def copy(self: SpatialHdrT) -> SpatialHdrT:
+    def copy(self) -> Self:
         """Copy object to independent representation
 
         The copy should not be affected by any changes to the original
@@ -586,7 +587,7 @@ def set_data_dtype(self, dtype: npt.DTypeLike) -> None:
         self._header.set_data_dtype(dtype)
 
     @classmethod
-    def from_image(klass: type[SpatialImgT], img: SpatialImage | FileBasedImage) -> SpatialImgT:
+    def from_image(klass, img: SpatialImage | FileBasedImage) -> Self:
         """Class method to create new instance of own class from `img`
 
         Parameters
@@ -610,7 +611,7 @@ def from_image(klass: type[SpatialImgT], img: SpatialImage | FileBasedImage) ->
         return super().from_image(img)
 
     @property
-    def slicer(self: SpatialImgT) -> SpatialFirstSlicer[SpatialImgT]:
+    def slicer(self) -> SpatialFirstSlicer[Self]:
         """Slicer object that returns cropped and subsampled images
 
         The image is resliced in the current orientation; no rotation or
@@ -658,7 +659,7 @@ def orthoview(self) -> OrthoSlicer3D:
         """
         return OrthoSlicer3D(self.dataobj, self.affine, title=self.get_filename())
 
-    def as_reoriented(self: SpatialImgT, ornt: Sequence[Sequence[int]]) -> SpatialImgT:
+    def as_reoriented(self, ornt: Sequence[Sequence[int]]) -> Self:
         """Apply an orientation change and return a new image
 
         If ornt is identity transform, return the original image, unchanged