From 6559c1fee4916b614796384831d6a07f0931de32 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Sun, 18 Jun 2023 22:17:40 +0530 Subject: [PATCH 01/10] add _file attribute in class SpooledTemporaryFile --- stdlib/tempfile.pyi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index b251f8b9d029..1eff68e6c275 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -383,6 +383,12 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): @property def encoding(self) -> str: ... # undocumented @property + def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented + if 'b' in self.mode: + return io.BytesIO + else: + return io.TextIOWrapper + @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes if sys.version_info >= (3, 8): @@ -546,6 +552,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] + @overload + def _file(self) -> io.BytesIO : ... + @overload + def _file(self) -> io.TextIOWrapper : ... @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From 413ca2444c761315a35bfa4573588238d0a3e752 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Sun, 18 Jun 2023 22:24:27 +0530 Subject: [PATCH 02/10] reformatting using black --- stdlib/tempfile.pyi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 1eff68e6c275..591fd40fe093 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -384,10 +384,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def encoding(self) -> str: ... # undocumented @property def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented - if 'b' in self.mode: + if "b" in self.mode: return io.BytesIO else: - return io.TextIOWrapper + return io.TextIOWrapper @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes @@ -552,10 +552,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - @overload - def _file(self) -> io.BytesIO : ... @overload - def _file(self) -> io.TextIOWrapper : ... + def _file(self) -> io.BytesIO: ... + @overload + def _file(self) -> io.TextIOWrapper: ... @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From e1d67eed2f94142bc73c67bda83fff525a433917 Mon Sep 17 00:00:00 2001 From: Sujal Gupta <55016909+heysujal@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:19:01 +0530 Subject: [PATCH 03/10] Update stdlib/tempfile.pyi Co-authored-by: Akuli --- stdlib/tempfile.pyi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 591fd40fe093..dcb1979a813d 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -552,10 +552,7 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - @overload - def _file(self) -> io.BytesIO: ... - @overload - def _file(self) -> io.TextIOWrapper: ... + _file: IO[AnyStr] @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From ad28bbadb4f1f60baac950c5358288d8d431235d Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Thu, 22 Jun 2023 14:26:06 +0530 Subject: [PATCH 04/10] delete def _file --- stdlib/tempfile.pyi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index dcb1979a813d..22bf3fb36093 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -383,12 +383,6 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): @property def encoding(self) -> str: ... # undocumented @property - def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented - if "b" in self.mode: - return io.BytesIO - else: - return io.TextIOWrapper - @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes if sys.version_info >= (3, 8): From 0efa74895dc293ad2c318cff9f3a32ab80d333f1 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Sun, 18 Jun 2023 22:17:40 +0530 Subject: [PATCH 05/10] add _file attribute in class SpooledTemporaryFile --- stdlib/tempfile.pyi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index b251f8b9d029..1eff68e6c275 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -383,6 +383,12 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): @property def encoding(self) -> str: ... # undocumented @property + def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented + if 'b' in self.mode: + return io.BytesIO + else: + return io.TextIOWrapper + @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes if sys.version_info >= (3, 8): @@ -546,6 +552,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] + @overload + def _file(self) -> io.BytesIO : ... + @overload + def _file(self) -> io.TextIOWrapper : ... @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From 7c1164ee74bbec2880648ef610ce96ab97f308b7 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Sun, 18 Jun 2023 22:24:27 +0530 Subject: [PATCH 06/10] reformatting using black --- stdlib/tempfile.pyi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 1eff68e6c275..591fd40fe093 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -384,10 +384,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def encoding(self) -> str: ... # undocumented @property def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented - if 'b' in self.mode: + if "b" in self.mode: return io.BytesIO else: - return io.TextIOWrapper + return io.TextIOWrapper @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes @@ -552,10 +552,10 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - @overload - def _file(self) -> io.BytesIO : ... @overload - def _file(self) -> io.TextIOWrapper : ... + def _file(self) -> io.BytesIO: ... + @overload + def _file(self) -> io.TextIOWrapper: ... @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From 413a048f3caa2b64f0f39fd32b07a4064ae3f143 Mon Sep 17 00:00:00 2001 From: Sujal Gupta <55016909+heysujal@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:19:01 +0530 Subject: [PATCH 07/10] Update stdlib/tempfile.pyi Co-authored-by: Akuli --- stdlib/tempfile.pyi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 591fd40fe093..dcb1979a813d 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -552,10 +552,7 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - @overload - def _file(self) -> io.BytesIO: ... - @overload - def _file(self) -> io.TextIOWrapper: ... + _file: IO[AnyStr] @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From b2f92081d94605b6127b257d0cb19b452d7a7fc1 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Thu, 22 Jun 2023 14:26:06 +0530 Subject: [PATCH 08/10] delete def _file --- stdlib/tempfile.pyi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index dcb1979a813d..22bf3fb36093 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -383,12 +383,6 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): @property def encoding(self) -> str: ... # undocumented @property - def _file(self) -> io.BytesIO | io.TextIOWrapper: # undocumented - if "b" in self.mode: - return io.BytesIO - else: - return io.TextIOWrapper - @property def newlines(self) -> str | tuple[str, ...] | None: ... # undocumented # bytes needs to go first, as default mode is to open as bytes if sys.version_info >= (3, 8): From 06648f1e6f8aec2df093a075b2ce5a540b9a6842 Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Fri, 23 Jun 2023 20:32:32 +0530 Subject: [PATCH 09/10] move _file at start of class SpooledTemporaryFile --- stdlib/tempfile.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 22bf3fb36093..ea04303683b5 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -380,6 +380,7 @@ else: # It does not actually derive from IO[AnyStr], but it does mostly behave # like one. class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): + _file: IO[AnyStr] @property def encoding(self) -> str: ... # undocumented @property @@ -546,7 +547,6 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - _file: IO[AnyStr] @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload From 9c3222498bb862215b737ff8d49aff9677becb1d Mon Sep 17 00:00:00 2001 From: Sujal Gupta Date: Fri, 23 Jun 2023 20:34:58 +0530 Subject: [PATCH 10/10] remove extra _file --- stdlib/tempfile.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index d1ec9fb775d3..ea04303683b5 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -547,7 +547,6 @@ class SpooledTemporaryFile(IO[AnyStr], _SpooledTemporaryFileBase): def seek(self, offset: int, whence: int = ...) -> int: ... def tell(self) -> int: ... def truncate(self, size: int | None = None) -> None: ... # type: ignore[override] - _file: IO[AnyStr] @overload def write(self: SpooledTemporaryFile[str], s: str) -> int: ... @overload