Skip to content

Commit 2d82e1f

Browse files
authored
zipfile.ZipFile: fix fp, extract (#3828)
* zipfile: fp is None in a lot of error cases * zipfile: pwd can be None in extract Co-authored-by: hauntsaninja <>
1 parent e5a276c commit 2d82e1f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

stdlib/2and3/zipfile.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ZipFile:
6666
debug: int
6767
comment: bytes
6868
filelist: List[ZipInfo]
69-
fp: IO[bytes]
69+
fp: Optional[IO[bytes]]
7070
NameToInfo: Dict[Text, ZipInfo]
7171
start_dir: int # undocumented
7272
if sys.version_info >= (3, 8):
@@ -102,7 +102,7 @@ class ZipFile:
102102
def infolist(self) -> List[ZipInfo]: ...
103103
def namelist(self) -> List[Text]: ...
104104
def open(self, name: _SZI, mode: Text = ..., pwd: Optional[bytes] = ..., *, force_zip64: bool = ...) -> IO[bytes]: ...
105-
def extract(self, member: _SZI, path: Optional[_SZI] = ..., pwd: bytes = ...) -> str: ...
105+
def extract(self, member: _SZI, path: Optional[_SZI] = ..., pwd: Optional[bytes] = ...) -> str: ...
106106
def extractall(
107107
self, path: Optional[_Path] = ..., members: Optional[Iterable[Text]] = ..., pwd: Optional[bytes] = ...
108108
) -> None: ...

tests/stubtest_whitelists/py3_common.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,4 @@ xml.etree.cElementTree.TreeBuilder.start
915915
xml.sax.xmlreader.AttributesImpl.has_key
916916
zipfile.ZipExtFile.read
917917
zipfile.ZipExtFile.readline
918-
zipfile.ZipFile.extract
919-
zipfile.ZipFile.fp
920918
zlib.compressobj

0 commit comments

Comments
 (0)