Skip to content

Commit 8de9b85

Browse files
authored
itertools: fix postional-only args, stubtest whitelist (#4936)
1 parent a7a037b commit 8de9b85

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

stdlib/3/itertools.pyi

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Predicate = Callable[[_T], object]
1010
def count(start: _N = ..., step: _N = ...) -> Iterator[_N]: ... # more general types?
1111

1212
class cycle(Iterator[_T], Generic[_T]):
13-
def __init__(self, iterable: Iterable[_T]) -> None: ...
13+
def __init__(self, __iterable: Iterable[_T]) -> None: ...
1414
def __next__(self) -> _T: ...
1515
def __iter__(self) -> Iterator[_T]: ...
1616

@@ -33,21 +33,23 @@ class chain(Iterator[_T], Generic[_T]):
3333
def __next__(self) -> _T: ...
3434
def __iter__(self) -> Iterator[_T]: ...
3535
@staticmethod
36-
def from_iterable(iterable: Iterable[Iterable[_S]]) -> Iterator[_S]: ...
36+
def from_iterable(__iterable: Iterable[Iterable[_S]]) -> Iterator[_S]: ...
3737

3838
def compress(data: Iterable[_T], selectors: Iterable[Any]) -> Iterator[_T]: ...
39-
def dropwhile(predicate: Predicate[_T], iterable: Iterable[_T]) -> Iterator[_T]: ...
40-
def filterfalse(predicate: Optional[Predicate[_T]], iterable: Iterable[_T]) -> Iterator[_T]: ...
39+
def dropwhile(__predicate: Predicate[_T], __iterable: Iterable[_T]) -> Iterator[_T]: ...
40+
def filterfalse(__predicate: Optional[Predicate[_T]], __iterable: Iterable[_T]) -> Iterator[_T]: ...
4141
@overload
4242
def groupby(iterable: Iterable[_T], key: None = ...) -> Iterator[Tuple[_T, Iterator[_T]]]: ...
4343
@overload
4444
def groupby(iterable: Iterable[_T], key: Callable[[_T], _S]) -> Iterator[Tuple[_S, Iterator[_T]]]: ...
4545
@overload
46-
def islice(iterable: Iterable[_T], stop: Optional[int]) -> Iterator[_T]: ...
46+
def islice(__iterable: Iterable[_T], __stop: Optional[int]) -> Iterator[_T]: ...
4747
@overload
48-
def islice(iterable: Iterable[_T], start: Optional[int], stop: Optional[int], step: Optional[int] = ...) -> Iterator[_T]: ...
49-
def starmap(func: Callable[..., _S], iterable: Iterable[Iterable[Any]]) -> Iterator[_S]: ...
50-
def takewhile(predicate: Predicate[_T], iterable: Iterable[_T]) -> Iterator[_T]: ...
48+
def islice(
49+
__iterable: Iterable[_T], __start: Optional[int], __stop: Optional[int], __step: Optional[int] = ...
50+
) -> Iterator[_T]: ...
51+
def starmap(__function: Callable[..., _S], __iterable: Iterable[Iterable[Any]]) -> Iterator[_S]: ...
52+
def takewhile(__predicate: Predicate[_T], __iterable: Iterable[_T]) -> Iterator[_T]: ...
5153
def tee(__iterable: Iterable[_T], __n: int = ...) -> Tuple[Iterator[_T], ...]: ...
5254
def zip_longest(*p: Iterable[Any], fillvalue: Any = ...) -> Iterator[Any]: ...
5355

@@ -58,37 +60,37 @@ _T4 = TypeVar("_T4")
5860
_T5 = TypeVar("_T5")
5961
_T6 = TypeVar("_T6")
6062
@overload
61-
def product(iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ...
63+
def product(__iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ...
6264
@overload
63-
def product(iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ...
65+
def product(__iter1: Iterable[_T1], __iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ...
6466
@overload
65-
def product(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ...
67+
def product(__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ...
6668
@overload
6769
def product(
68-
iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4]
70+
__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4]
6971
) -> Iterator[Tuple[_T1, _T2, _T3, _T4]]: ...
7072
@overload
7173
def product(
72-
iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3], iter4: Iterable[_T4], iter5: Iterable[_T5]
74+
__iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3], __iter4: Iterable[_T4], __iter5: Iterable[_T5]
7375
) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5]]: ...
7476
@overload
7577
def product(
76-
iter1: Iterable[_T1],
77-
iter2: Iterable[_T2],
78-
iter3: Iterable[_T3],
79-
iter4: Iterable[_T4],
80-
iter5: Iterable[_T5],
81-
iter6: Iterable[_T6],
78+
__iter1: Iterable[_T1],
79+
__iter2: Iterable[_T2],
80+
__iter3: Iterable[_T3],
81+
__iter4: Iterable[_T4],
82+
__iter5: Iterable[_T5],
83+
__iter6: Iterable[_T6],
8284
) -> Iterator[Tuple[_T1, _T2, _T3, _T4, _T5, _T6]]: ...
8385
@overload
8486
def product(
85-
iter1: Iterable[Any],
86-
iter2: Iterable[Any],
87-
iter3: Iterable[Any],
88-
iter4: Iterable[Any],
89-
iter5: Iterable[Any],
90-
iter6: Iterable[Any],
91-
iter7: Iterable[Any],
87+
__iter1: Iterable[Any],
88+
__iter2: Iterable[Any],
89+
__iter3: Iterable[Any],
90+
__iter4: Iterable[Any],
91+
__iter5: Iterable[Any],
92+
__iter6: Iterable[Any],
93+
__iter7: Iterable[Any],
9294
*iterables: Iterable[Any],
9395
) -> Iterator[Tuple[Any, ...]]: ...
9496
@overload

tests/stubtest_whitelists/py36.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ importlib.metadata
3030
importlib.resources
3131
io.StringIO.readline
3232
ipaddress._BaseNetwork.__init__
33+
itertools.accumulate
3334
json.loads
3435
mmap.ACCESS_DEFAULT
3536
multiprocessing.shared_memory

tests/stubtest_whitelists/py37.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ http.client.HTTPSConnection.__init__
3636
http.server.SimpleHTTPRequestHandler.__init__
3737
importlib.metadata
3838
ipaddress._BaseNetwork.__init__
39+
itertools.accumulate
3940
json.loads
4041
macurl2path # removed in 3.7
4142
multiprocessing.shared_memory

0 commit comments

Comments
 (0)