Skip to content

Revert "Use Literal for compression in zipfile (#9346)" #9367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2022
Merged

Revert "Use Literal for compression in zipfile (#9346)" #9367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions stdlib/zipfile.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ _DateTuple: TypeAlias = tuple[int, int, int, int, int, int]
_ReadWriteMode: TypeAlias = Literal["r", "w"]
_ReadWriteBinaryMode: TypeAlias = Literal["r", "w", "rb", "wb"]
_ZipFileMode: TypeAlias = Literal["r", "w", "x", "a"]
_CompressionMode: TypeAlias = Literal[0, 8, 12, 14]

class BadZipFile(Exception): ...

Expand Down Expand Up @@ -101,7 +100,7 @@ class ZipFile:
fp: IO[bytes] | None
NameToInfo: dict[str, ZipInfo]
start_dir: int # undocumented
compression: _CompressionMode # undocumented
compression: int # undocumented
compresslevel: int | None # undocumented
mode: _ZipFileMode # undocumented
pwd: bytes | None # undocumented
Expand All @@ -111,7 +110,7 @@ class ZipFile:
self,
file: StrPath | IO[bytes],
mode: Literal["r"] = ...,
compression: _CompressionMode = ...,
compression: int = ...,
allowZip64: bool = ...,
compresslevel: int | None = ...,
*,
Expand All @@ -123,7 +122,7 @@ class ZipFile:
self,
file: StrPath | IO[bytes],
mode: _ZipFileMode = ...,
compression: _CompressionMode = ...,
compression: int = ...,
allowZip64: bool = ...,
compresslevel: int | None = ...,
*,
Expand All @@ -135,7 +134,7 @@ class ZipFile:
self,
file: StrPath | IO[bytes],
mode: _ZipFileMode = ...,
compression: _CompressionMode = ...,
compression: int = ...,
allowZip64: bool = ...,
compresslevel: int | None = ...,
*,
Expand All @@ -146,7 +145,7 @@ class ZipFile:
self,
file: StrPath | IO[bytes],
mode: _ZipFileMode = ...,
compression: _CompressionMode = ...,
compression: int = ...,
allowZip64: bool = ...,
compresslevel: int | None = ...,
) -> None: ...
Expand Down Expand Up @@ -185,19 +184,14 @@ class ZipFile:

class PyZipFile(ZipFile):
def __init__(
self,
file: str | IO[bytes],
mode: _ZipFileMode = ...,
compression: _CompressionMode = ...,
allowZip64: bool = ...,
optimize: int = ...,
self, file: str | IO[bytes], mode: _ZipFileMode = ..., compression: int = ..., allowZip64: bool = ..., optimize: int = ...
) -> None: ...
def writepy(self, pathname: str, basename: str = ..., filterfunc: Callable[[str], bool] | None = ...) -> None: ...

class ZipInfo:
filename: str
date_time: _DateTuple
compress_type: _CompressionMode
compress_type: int
comment: bytes
extra: bytes
create_system: int
Expand Down Expand Up @@ -275,10 +269,10 @@ if sys.version_info >= (3, 8):

def is_zipfile(filename: StrOrBytesPath | _SupportsReadSeekTell) -> bool: ...

ZIP_STORED: Literal[0]
ZIP_DEFLATED: Literal[8]
ZIP_STORED: int
ZIP_DEFLATED: int
ZIP64_LIMIT: int
ZIP_FILECOUNT_LIMIT: int
ZIP_MAX_COMMENT: int
ZIP_BZIP2: Literal[12]
ZIP_LZMA: Literal[14]
ZIP_BZIP2: int
ZIP_LZMA: int