Use typing.Self (#175)

Author: hugovk

src/PIL/ContainerIO.py

@@ -19,6 +19,10 @@
 from collections.abc import Iterable
 from typing import IO, AnyStr, NoReturn
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Self
+
 
 class ContainerIO(IO[AnyStr]):
     """
@@ -147,13 +151,13 @@ def writelines(self, lines: Iterable[AnyStr]) -> NoReturn:
     def truncate(self, size: int | None = None) -> int:
         raise NotImplementedError()
 
-    def __enter__(self) -> ContainerIO[AnyStr]:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None:
         self.close()
 
-    def __iter__(self) -> ContainerIO[AnyStr]:
+    def __iter__(self) -> Self:
         return self
 
     def __next__(self) -> AnyStr:

src/PIL/GimpPaletteFile.py

@@ -20,7 +20,7 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import IO
+    from typing import IO, Self
 
 
 class GimpPaletteFile:
@@ -66,7 +66,7 @@ def __init__(self, fp: IO[bytes]) -> None:
         self._read(fp)
 
     @classmethod
-    def frombytes(cls, data: bytes) -> GimpPaletteFile:
+    def frombytes(cls, data: bytes) -> Self:
         self = cls.__new__(cls)
         self._read(BytesIO(data), False)
         return self

src/PIL/Image.py

@@ -67,7 +67,7 @@
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator, Sequence
     from types import ModuleType
-    from typing import Any, Literal
+    from typing import Any, Literal, Self
 
 logger = logging.getLogger(__name__)
 
@@ -691,7 +691,7 @@ def _new(self, im: core.ImagingCore) -> Image:
         return new
 
     # Context manager support
-    def __enter__(self) -> Image:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None:

src/PIL/ImageFile.py

@@ -41,6 +41,8 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
+    from typing import Self
+
     from ._typing import StrOrBytesPath
 
 logger = logging.getLogger(__name__)
@@ -173,10 +175,6 @@ def __init__(
     def _open(self) -> None:
         pass
 
-    # Context manager support
-    def __enter__(self) -> ImageFile:
-        return self
-
     def _close_fp(self) -> None:
         if getattr(self, "_fp", False) and not isinstance(self._fp, DeferredError):
             if self._fp != self.fp:
@@ -185,6 +183,7 @@ def _close_fp(self) -> None:
         if self.fp:
             self.fp.close()
 
+    # Context manager support
     def __exit__(self, *args: object) -> None:
         if getattr(self, "_exclusive_fp", False):
             self._close_fp()
@@ -601,7 +600,7 @@ def feed(self, data: bytes) -> None:
 
                 self.image = im
 
-    def __enter__(self) -> Parser:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None:

src/PIL/ImageMath.py

@@ -24,7 +24,7 @@
 if TYPE_CHECKING:
     from collections.abc import Callable
     from types import CodeType
-    from typing import Any
+    from typing import Any, Self
 
 
 class _Operand:
@@ -104,7 +104,7 @@ def __bool__(self) -> bool:
     def __abs__(self) -> _Operand:
         return self.apply("abs", self)
 
-    def __pos__(self) -> _Operand:
+    def __pos__(self) -> Self:
         return self
 
     def __neg__(self) -> _Operand:

src/PIL/ImageSequence.py

@@ -21,6 +21,7 @@
 TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Callable
+    from typing import Self
 
 
 class Iterator:
@@ -50,7 +51,7 @@ def __getitem__(self, ix: int) -> Image.Image:
             msg = "end of sequence"
             raise IndexError(msg) from e
 
-    def __iter__(self) -> Iterator:
+    def __iter__(self) -> Self:
         return self
 
     def __next__(self) -> Image.Image:

src/PIL/PdfParser.py

@@ -14,7 +14,7 @@
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import IO
+    from typing import IO, Self
 
     _DictBase = collections.UserDict[str | bytes, Any]
 else:
@@ -427,7 +427,7 @@ def __init__(
         if f:
             self.seek_end()
 
-    def __enter__(self) -> PdfParser:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None:

src/PIL/PngImagePlugin.py

@@ -53,7 +53,7 @@
 TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Callable
-    from typing import Any, NoReturn
+    from typing import Any, NoReturn, Self
 
     from . import _imaging
 
@@ -184,7 +184,7 @@ def read(self) -> tuple[bytes, int, int]:
 
         return cid, pos, length
 
-    def __enter__(self) -> ChunkStream:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None:
@@ -265,7 +265,7 @@ class iTXt(str):
     @staticmethod
     def __new__(
         cls, text: str, lang: str | None = None, tkey: str | None = None
-    ) -> iTXt:
+    ) -> Self:
         """
         :param cls: the class to use when creating the instance
         :param text: value for this key
@@ -399,9 +399,6 @@ def __init__(self, fp: IO[bytes]) -> None:
 
         self.text_memory = 0
 
-    def __enter__(self) -> PngStream:
-        return self
-
     def check_text_memory(self, chunklen: int) -> None:
         self.text_memory += chunklen
         if self.text_memory > MAX_TEXT_MEMORY:

src/PIL/TiffImagePlugin.py

@@ -62,7 +62,7 @@
 TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from typing import NoReturn
+    from typing import NoReturn, Self
 
     from ._typing import Buffer, IntegralLike, StrOrBytesPath
 
@@ -2117,7 +2117,7 @@ def newFrame(self) -> None:
         self.finalize()
         self.setup()
 
-    def __enter__(self) -> AppendingTiffWriter:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *args: object) -> None: