From 5d881e4be0611f3287fac1b914e551d11bdfa32d Mon Sep 17 00:00:00 2001
From: Rogdham <3994389+Rogdham@users.noreply.github.com>
Date: Mon, 7 Jul 2025 13:05:45 +0200
Subject: [PATCH] Python 3.14: PEP-784 zstd in other modules (#14225)

---
 stdlib/@tests/stubtest_allowlists/py314.txt   |   1 -
 .../compression/{bz2/__init__.pyi => bz2.pyi} |   0
 .../{gzip/__init__.pyi => gzip.pyi}           |   0
 .../{lzma/__init__.pyi => lzma.pyi}           |   0
 .../{zlib/__init__.pyi => zlib.pyi}           |   0
 stdlib/tarfile.pyi                            | 121 +++++++++++++++++-
 6 files changed, 117 insertions(+), 5 deletions(-)
 rename stdlib/compression/{bz2/__init__.pyi => bz2.pyi} (100%)
 rename stdlib/compression/{gzip/__init__.pyi => gzip.pyi} (100%)
 rename stdlib/compression/{lzma/__init__.pyi => lzma.pyi} (100%)
 rename stdlib/compression/{zlib/__init__.pyi => zlib.pyi} (100%)

diff --git a/stdlib/@tests/stubtest_allowlists/py314.txt b/stdlib/@tests/stubtest_allowlists/py314.txt
index eeb61bfc1..7eb5e7340 100644
--- a/stdlib/@tests/stubtest_allowlists/py314.txt
+++ b/stdlib/@tests/stubtest_allowlists/py314.txt
@@ -13,7 +13,6 @@ multiprocessing.managers._BaseDictProxy.__ror__
 multiprocessing.managers._BaseDictProxy.fromkeys
 multiprocessing.process.BaseProcess.interrupt
 multiprocessing.synchronize.SemLock.locked
-tarfile.TarFile.zstopen
 
 # =========================
 # New errors in Python 3.14
diff --git a/stdlib/compression/bz2/__init__.pyi b/stdlib/compression/bz2.pyi
similarity index 100%
rename from stdlib/compression/bz2/__init__.pyi
rename to stdlib/compression/bz2.pyi
diff --git a/stdlib/compression/gzip/__init__.pyi b/stdlib/compression/gzip.pyi
similarity index 100%
rename from stdlib/compression/gzip/__init__.pyi
rename to stdlib/compression/gzip.pyi
diff --git a/stdlib/compression/lzma/__init__.pyi b/stdlib/compression/lzma.pyi
similarity index 100%
rename from stdlib/compression/lzma/__init__.pyi
rename to stdlib/compression/lzma.pyi
diff --git a/stdlib/compression/zlib/__init__.pyi b/stdlib/compression/zlib.pyi
similarity index 100%
rename from stdlib/compression/zlib/__init__.pyi
rename to stdlib/compression/zlib.pyi
diff --git a/stdlib/tarfile.pyi b/stdlib/tarfile.pyi
index a18ef0b82..dba250f2d 100644
--- a/stdlib/tarfile.pyi
+++ b/stdlib/tarfile.pyi
@@ -9,6 +9,9 @@ from types import TracebackType
 from typing import IO, ClassVar, Literal, Protocol, overload
 from typing_extensions import Self, TypeAlias, deprecated
 
+if sys.version_info >= (3, 14):
+    from compression.zstd import ZstdDict
+
 __all__ = [
     "TarFile",
     "TarInfo",
@@ -186,6 +189,30 @@ class TarFile:
         debug: int | None = ...,
         errorlevel: int | None = ...,
     ) -> Self: ...
+    if sys.version_info >= (3, 14):
+        @overload
+        @classmethod
+        def open(
+            cls,
+            name: StrOrBytesPath | None,
+            mode: Literal["r:zst"],
+            fileobj: _Fileobj | None = None,
+            bufsize: int = 10240,
+            *,
+            format: int | None = ...,
+            tarinfo: type[TarInfo] | None = ...,
+            dereference: bool | None = ...,
+            ignore_zeros: bool | None = ...,
+            encoding: str | None = ...,
+            errors: str = ...,
+            pax_headers: Mapping[str, str] | None = ...,
+            debug: int | None = ...,
+            errorlevel: int | None = ...,
+            level: None = None,
+            options: Mapping[int, int] | None = None,
+            zstd_dict: ZstdDict | None = None,
+        ) -> Self: ...
+
     @overload
     @classmethod
     def open(
@@ -304,12 +331,56 @@ class TarFile:
         errorlevel: int | None = ...,
         preset: Literal[0, 1, 2, 3, 4, 5, 6, 7, 8, 9] | None = ...,
     ) -> Self: ...
+    if sys.version_info >= (3, 14):
+        @overload
+        @classmethod
+        def open(
+            cls,
+            name: StrOrBytesPath | None,
+            mode: Literal["x:zst", "w:zst"],
+            fileobj: _Fileobj | None = None,
+            bufsize: int = 10240,
+            *,
+            format: int | None = ...,
+            tarinfo: type[TarInfo] | None = ...,
+            dereference: bool | None = ...,
+            ignore_zeros: bool | None = ...,
+            encoding: str | None = ...,
+            errors: str = ...,
+            pax_headers: Mapping[str, str] | None = ...,
+            debug: int | None = ...,
+            errorlevel: int | None = ...,
+            options: Mapping[int, int] | None = None,
+            zstd_dict: ZstdDict | None = None,
+        ) -> Self: ...
+        @overload
+        @classmethod
+        def open(
+            cls,
+            name: StrOrBytesPath | None = None,
+            *,
+            mode: Literal["x:zst", "w:zst"],
+            fileobj: _Fileobj | None = None,
+            bufsize: int = 10240,
+            format: int | None = ...,
+            tarinfo: type[TarInfo] | None = ...,
+            dereference: bool | None = ...,
+            ignore_zeros: bool | None = ...,
+            encoding: str | None = ...,
+            errors: str = ...,
+            pax_headers: Mapping[str, str] | None = ...,
+            debug: int | None = ...,
+            errorlevel: int | None = ...,
+            options: Mapping[int, int] | None = None,
+            zstd_dict: ZstdDict | None = None,
+        ) -> Self: ...
+
     @overload
     @classmethod
     def open(
         cls,
         name: StrOrBytesPath | ReadableBuffer | None,
-        mode: Literal["r|*", "r|", "r|gz", "r|bz2", "r|xz"],
+        mode: Literal["r|*", "r|", "r|gz", "r|bz2", "r|xz", "r|zst"],
         fileobj: _Fileobj | None = None,
         bufsize: int = 10240,
         *,
@@ -329,7 +400,7 @@ class TarFile:
         cls,
         name: StrOrBytesPath | ReadableBuffer | None = None,
         *,
-        mode: Literal["r|*", "r|", "r|gz", "r|bz2", "r|xz"],
+        mode: Literal["r|*", "r|", "r|gz", "r|bz2", "r|xz", "r|zst"],
         fileobj: _Fileobj | None = None,
         bufsize: int = 10240,
         format: int | None = ...,
@@ -347,7 +418,7 @@ class TarFile:
     def open(
         cls,
         name: StrOrBytesPath | WriteableBuffer | None,
-        mode: Literal["w|", "w|xz"],
+        mode: Literal["w|", "w|xz", "w|zst"],
         fileobj: _Fileobj | None = None,
         bufsize: int = 10240,
         *,
@@ -367,7 +438,7 @@ class TarFile:
         cls,
         name: StrOrBytesPath | WriteableBuffer | None = None,
         *,
-        mode: Literal["w|", "w|xz"],
+        mode: Literal["w|", "w|xz", "w|zst"],
         fileobj: _Fileobj | None = None,
         bufsize: int = 10240,
         format: int | None = ...,
@@ -526,6 +597,48 @@ class TarFile:
         debug: int | None = ...,
         errorlevel: int | None = ...,
     ) -> Self: ...
+    if sys.version_info >= (3, 14):
+        @overload
+        @classmethod
+        def zstopen(
+            cls,
+            name: StrOrBytesPath | None,
+            mode: Literal["r"] = "r",
+            fileobj: IO[bytes] | None = None,
+            level: None = None,
+            options: Mapping[int, int] | None = None,
+            zstd_dict: ZstdDict | None = None,
+            *,
+            format: int | None = ...,
+            tarinfo: type[TarInfo] | None = ...,
+            dereference: bool | None = ...,
+            ignore_zeros: bool | None = ...,
+            encoding: str | None = ...,
+            pax_headers: Mapping[str, str] | None = ...,
+            debug: int | None = ...,
+            errorlevel: int | None = ...,
+        ) -> Self: ...
+        @overload
+        @classmethod
+        def zstopen(
+            cls,
+            name: StrOrBytesPath | None,
+            mode: Literal["w", "x"],
+            fileobj: IO[bytes] | None = None,
+            level: int | None = None,
+            options: Mapping[int, int] | None = None,
+            zstd_dict: ZstdDict | None = None,
+            *,
+            format: int | None = ...,
+            tarinfo: type[TarInfo] | None = ...,
+            dereference: bool | None = ...,
+            ignore_zeros: bool | None = ...,
+            encoding: str | None = ...,
+            pax_headers: Mapping[str, str] | None = ...,
+            debug: int | None = ...,
+            errorlevel: int | None = ...,
+        ) -> Self: ...
+
     def getmember(self, name: str) -> TarInfo: ...
     def getmembers(self) -> _list[TarInfo]: ...
     def getnames(self) -> _list[str]: ...