Skip to content

Commit 2d1382c

Browse files
committed
Merge pull request #444 from yczhu/refactor-stub-overloads
Fix #433. Refactor overloads away in zipfile stubs
2 parents 15e1529 + 9fd422b commit 2d1382c

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

stubs/3.2/zipfile.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
# TODO these are incomplete
22

3-
from typing import overload, List, Undefined, Tuple, BinaryIO
3+
from typing import List, Undefined, Tuple, BinaryIO, Union
44

55
ZIP_STORED = 0
66
ZIP_DEFLATED = 0
77

8-
@overload
9-
def is_zipfile(filename: str) -> bool: pass
10-
@overload
11-
def is_zipfile(filename: BinaryIO) -> bool: pass
8+
def is_zipfile(filename: Union[str, BinaryIO]) -> bool: pass
129

1310
class ZipInfo:
1411
filename = ''
@@ -17,25 +14,14 @@ class ZipInfo:
1714
file_size = 0
1815

1916
class ZipFile:
20-
@overload
21-
def __init__(self, file: str, mode: str = 'r',
17+
def __init__(self, file: Union[str, BinaryIO], mode: str = 'r',
2218
compression: int = ZIP_STORED,
2319
allowZip64: bool = False) -> None: pass
24-
@overload
25-
def __init__(self, file: BinaryIO, mode: str = 'r',
26-
compression: int = ZIP_STORED,
27-
allowZip64: bool = False) -> None: pass
28-
2920
def close(self) -> None: pass
3021
def getinfo(name: str) -> ZipInfo: pass
3122
def infolist(self) -> List[ZipInfo]: pass
3223
def namelist(self) -> List[str]: pass
33-
34-
@overload
35-
def read(self, name: str, pwd: str = None) -> bytes: pass
36-
@overload
37-
def read(self, name: ZipInfo, pwd: str = None) -> bytes: pass
38-
24+
def read(self, name: Union[str, ZipInfo], pwd: str = None) -> bytes: pass
3925
def write(self, filename: str, arcname: str = None,
4026
compress_type: int = None) -> None: pass
4127

0 commit comments

Comments
 (0)