Skip to content

Commit b6a4307

Browse files
spkerstenspkersten
committed
Renamed all remaining local type vars to start with an underscore
1 parent a7f13cc commit b6a4307

File tree

12 files changed

+130
-130
lines changed

12 files changed

+130
-130
lines changed

‎stubs/3.2/atexit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import typevar, Any
22

3-
FT = typevar('FT')
3+
_FT = typevar('_FT')
44

5-
def register(func: FT, *args: Any, **kargs: Any) -> FT: pass
5+
def register(func: _FT, *args: Any, **kargs: Any) -> _FT: pass

‎stubs/3.2/collections.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,87 +13,87 @@
1313
Mapping, List, Tuple, Undefined, Function, Set, Sequence, Sized
1414
)
1515

16-
T = typevar('T')
17-
KT = typevar('KT')
18-
VT = typevar('VT')
16+
_T = typevar('_T')
17+
_KT = typevar('_KT')
18+
_VT = typevar('_VT')
1919

2020

21-
class deque(Sized, Iterable[T], AbstractGeneric[T]):
21+
class deque(Sized, Iterable[_T], AbstractGeneric[_T]):
2222
# TODO int with None default
2323
maxlen = 0 # TODO readonly
24-
def __init__(self, iterable: Iterable[T] = None,
24+
def __init__(self, iterable: Iterable[_T] = None,
2525
maxlen: int = None) -> None: pass
26-
def append(self, x: T) -> None: pass
27-
def appendleft(self, x: T) -> None: pass
26+
def append(self, x: _T) -> None: pass
27+
def appendleft(self, x: _T) -> None: pass
2828
def clear(self) -> None: pass
29-
def count(self, x: T) -> int: pass
30-
def extend(self, iterable: Iterable[T]) -> None: pass
31-
def extendleft(self, iterable: Iterable[T]) -> None: pass
32-
def pop(self) -> T: pass
33-
def popleft(self) -> T: pass
34-
def remove(self, value: T) -> None: pass
29+
def count(self, x: _T) -> int: pass
30+
def extend(self, iterable: Iterable[_T]) -> None: pass
31+
def extendleft(self, iterable: Iterable[_T]) -> None: pass
32+
def pop(self) -> _T: pass
33+
def popleft(self) -> _T: pass
34+
def remove(self, value: _T) -> None: pass
3535
def reverse(self) -> None: pass
3636
def rotate(self, n: int) -> None: pass
3737

3838
def __len__(self) -> int: pass
39-
def __iter__(self) -> Iterator[T]: pass
39+
def __iter__(self) -> Iterator[_T]: pass
4040
def __str__(self) -> str: pass
4141
def __hash__(self) -> int: pass
4242

43-
def __getitem__(self, i: int) -> T: pass
44-
def __setitem__(self, i: int, x: T) -> None: pass
45-
def __contains__(self, o: T) -> bool: pass
43+
def __getitem__(self, i: int) -> _T: pass
44+
def __setitem__(self, i: int, x: _T) -> None: pass
45+
def __contains__(self, o: _T) -> bool: pass
4646

4747
# TODO __reversed__
4848

4949

50-
class Counter(Dict[T, int], Generic[T]):
50+
class Counter(Dict[_T, int], Generic[_T]):
5151
@overload
5252
def __init__(self) -> None: pass
5353
@overload
54-
def __init__(self, Mapping: Mapping[T, int]) -> None: pass
54+
def __init__(self, Mapping: Mapping[_T, int]) -> None: pass
5555
@overload
56-
def __init__(self, iterable: Iterable[T]) -> None: pass
56+
def __init__(self, iterable: Iterable[_T]) -> None: pass
5757
# TODO keyword arguments
5858

59-
def elements(self) -> Iterator[T]: pass
59+
def elements(self) -> Iterator[_T]: pass
6060

6161
@overload
62-
def most_common(self) -> List[T]: pass
62+
def most_common(self) -> List[_T]: pass
6363
@overload
64-
def most_common(self, n: int) -> List[T]: pass
64+
def most_common(self, n: int) -> List[_T]: pass
6565

6666
@overload
67-
def subtract(self, Mapping: Mapping[T, int]) -> None: pass
67+
def subtract(self, Mapping: Mapping[_T, int]) -> None: pass
6868
@overload
69-
def subtract(self, iterable: Iterable[T]) -> None: pass
69+
def subtract(self, iterable: Iterable[_T]) -> None: pass
7070

7171
# TODO update
7272

7373

74-
class OrderedDict(Dict[KT, VT], Generic[KT, VT]):
75-
def popitem(self, last: bool = True) -> Tuple[KT, VT]: pass
76-
def move_to_end(self, key: KT, last: bool = True) -> None: pass
74+
class OrderedDict(Dict[_KT, _VT], Generic[_KT, _VT]):
75+
def popitem(self, last: bool = True) -> Tuple[_KT, _VT]: pass
76+
def move_to_end(self, key: _KT, last: bool = True) -> None: pass
7777

7878

79-
class defaultdict(Dict[KT, VT], Generic[KT, VT]):
80-
default_factory = Undefined(Function[[], VT])
79+
class defaultdict(Dict[_KT, _VT], Generic[_KT, _VT]):
80+
default_factory = Undefined(Function[[], _VT])
8181

8282
@overload
8383
def __init__(self) -> None: pass
8484
@overload
85-
def __init__(self, map: Mapping[KT, VT]) -> None: pass
85+
def __init__(self, map: Mapping[_KT, _VT]) -> None: pass
8686
@overload
87-
def __init__(self, iterable: Iterable[Tuple[KT, VT]]) -> None: pass
87+
def __init__(self, iterable: Iterable[Tuple[_KT, _VT]]) -> None: pass
8888
@overload
89-
def __init__(self, default_factory: Function[[], VT]) -> None: pass
89+
def __init__(self, default_factory: Function[[], _VT]) -> None: pass
9090
@overload
91-
def __init__(self, default_factory: Function[[], VT],
92-
map: Mapping[KT, VT]) -> None: pass
91+
def __init__(self, default_factory: Function[[], _VT],
92+
map: Mapping[_KT, _VT]) -> None: pass
9393
@overload
94-
def __init__(self, default_factory: Function[[], VT],
95-
iterable: Iterable[Tuple[KT, VT]]) -> None: pass
94+
def __init__(self, default_factory: Function[[], _VT],
95+
iterable: Iterable[Tuple[_KT, _VT]]) -> None: pass
9696
# TODO __init__ keyword args
9797

98-
def __missing__(self, key: KT) -> VT: pass
98+
def __missing__(self, key: _KT) -> _VT: pass
9999
# TODO __reversed__

‎stubs/3.2/copy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
from typing import typevar
66

7-
T = typevar('T')
7+
_T = typevar('_T')
88

9-
def deepcopy(x: T) -> T: pass
9+
def deepcopy(x: _T) -> _T: pass

‎stubs/3.2/heapq.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
from typing import typevar, List, Iterable, Any, Function
66

7-
T = typevar('T')
7+
_T = typevar('_T')
88

9-
def heappush(heap: List[T], item: T) -> None: pass
10-
def heappop(heap: List[T]) -> T: pass
11-
def heappushpop(heap: List[T], item: T) -> T: pass
12-
def heapify(x: List[T]) -> None: pass
13-
def heapreplace(heap: List[T], item: T) -> T: pass
14-
def merge(*iterables: Iterable[T]) -> Iterable[T]: pass
15-
def nlargest(n: int, iterable: Iterable[T],
16-
key: Function[[T], Any] = None) -> List[T]: pass
17-
def nsmallest(n: int, iterable: Iterable[T],
18-
key: Function[[T], Any] = None) -> List[T]: pass
9+
def heappush(heap: List[_T], item: _T) -> None: pass
10+
def heappop(heap: List[_T]) -> _T: pass
11+
def heappushpop(heap: List[_T], item: _T) -> _T: pass
12+
def heapify(x: List[_T]) -> None: pass
13+
def heapreplace(heap: List[_T], item: _T) -> _T: pass
14+
def merge(*iterables: Iterable[_T]) -> Iterable[_T]: pass
15+
def nlargest(n: int, iterable: Iterable[_T],
16+
key: Function[[_T], Any] = None) -> List[_T]: pass
17+
def nsmallest(n: int, iterable: Iterable[_T],
18+
key: Function[[_T], Any] = None) -> List[_T]: pass

‎stubs/3.2/imp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from typing import typevar
66

7-
T = typevar('T')
7+
_T = typevar('_T')
88

99
def cache_from_source(path: str, debug_override: bool = None) -> str: pass
10-
def reload(module: T) -> T: pass # TODO imprecise signature
10+
def reload(module: _T) -> _T: pass # TODO imprecise signature

‎stubs/3.2/itertools.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,53 @@
55
from typing import (Iterator, typevar, Iterable, overload, Any, Function, Tuple,
66
Union, Sequence)
77

8-
T = typevar('T')
9-
S = typevar('S')
8+
_T = typevar('_T')
9+
_S = typevar('_S')
1010

1111
def count(start: int = 0,
1212
step: int = 1) -> Iterator[int]: pass # more general types?
13-
def cycle(iterable: Iterable[T]) -> Iterator[T]: pass
13+
def cycle(iterable: Iterable[_T]) -> Iterator[_T]: pass
1414

1515
@overload
16-
def repeat(object: T) -> Iterator[T]: pass
16+
def repeat(object: _T) -> Iterator[_T]: pass
1717
@overload
18-
def repeat(object: T, times: int) -> Iterator[T]: pass
18+
def repeat(object: _T, times: int) -> Iterator[_T]: pass
1919

20-
def accumulate(iterable: Iterable[T]) -> Iterator[T]: pass
21-
def chain(*iterables: Iterable[T]) -> Iterator[T]: pass
20+
def accumulate(iterable: Iterable[_T]) -> Iterator[_T]: pass
21+
def chain(*iterables: Iterable[_T]) -> Iterator[_T]: pass
2222
# TODO chain.from_Iterable
23-
def compress(data: Iterable[T], selectors: Iterable[Any]) -> Iterator[T]: pass
24-
def dropwhile(predicate: Function[[T], Any],
25-
iterable: Iterable[T]) -> Iterator[T]: pass
26-
def filterfalse(predicate: Function[[T], Any],
27-
iterable: Iterable[T]) -> Iterator[T]: pass
23+
def compress(data: Iterable[_T], selectors: Iterable[Any]) -> Iterator[_T]: pass
24+
def dropwhile(predicate: Function[[_T], Any],
25+
iterable: Iterable[_T]) -> Iterator[_T]: pass
26+
def filterfalse(predicate: Function[[_T], Any],
27+
iterable: Iterable[_T]) -> Iterator[_T]: pass
2828

2929
@overload
30-
def groupby(iterable: Iterable[T]) -> Iterator[Tuple[T, Iterator[T]]]: pass
30+
def groupby(iterable: Iterable[_T]) -> Iterator[Tuple[_T, Iterator[_T]]]: pass
3131
@overload
32-
def groupby(iterable: Iterable[T],
33-
key: Function[[T], S]) -> Iterator[Tuple[S, Iterator[T]]]: pass
32+
def groupby(iterable: Iterable[_T],
33+
key: Function[[_T], _S]) -> Iterator[Tuple[_S, Iterator[_T]]]: pass
3434

3535
@overload
36-
def islice(iterable: Iterable[T], stop: int) -> Iterator[T]: pass
36+
def islice(iterable: Iterable[_T], stop: int) -> Iterator[_T]: pass
3737
@overload
38-
def islice(iterable: Iterable[T], start: int, stop: int,
39-
step: int = 1) -> Iterator[T]: pass
38+
def islice(iterable: Iterable[_T], start: int, stop: int,
39+
step: int = 1) -> Iterator[_T]: pass
4040

4141
def starmap(func: Any, iterable: Iterable[Any]) -> Iterator[Any]: pass
42-
def takewhile(predicate: Function[[T], Any],
43-
iterable: Iterable[T]) -> Iterator[T]: pass
42+
def takewhile(predicate: Function[[_T], Any],
43+
iterable: Iterable[_T]) -> Iterator[_T]: pass
4444
def tee(iterable: Iterable[Any], n: int = 2) -> Iterator[Any]: pass
4545
def zip_longest(*p: Iterable[Any],
4646
fillvalue: Any = None) -> Iterator[Any]: pass
4747

4848
# TODO: Return type should be Iterator[Tuple[..]], but unknown tuple shape.
49-
# Iterator[Sequence[T]] loses this type information.
50-
def product(*p: Iterable[T], repeat: int = 1) -> Iterator[Sequence[T]]: pass
51-
52-
def permutations(iterable: Iterable[T],
53-
r: Union[int, None] = None) -> Iterator[Sequence[T]]: pass
54-
def combinations(iterable: Iterable[T],
55-
r: int) -> Iterable[Sequence[T]]: pass
56-
def combinations_with_replacement(iterable: Iterable[T],
57-
r: int) -> Iterable[Sequence[T]]: pass
49+
# Iterator[Sequence[_T]] loses this type information.
50+
def product(*p: Iterable[_T], repeat: int = 1) -> Iterator[Sequence[_T]]: pass
51+
52+
def permutations(iterable: Iterable[_T],
53+
r: Union[int, None] = None) -> Iterator[Sequence[_T]]: pass
54+
def combinations(iterable: Iterable[_T],
55+
r: int) -> Iterable[Sequence[_T]]: pass
56+
def combinations_with_replacement(iterable: Iterable[_T],
57+
r: int) -> Iterable[Sequence[_T]]: pass

‎stubs/3.2/random.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Any, typevar, Sequence, List, Function, AbstractSet, Union
1212
)
1313

14-
t = typevar('t')
14+
_T = typevar('_T')
1515

1616
class Random(_random.Random):
1717
def __init__(self, x: Any = None) -> None: pass
@@ -21,9 +21,9 @@ def setstate(self, state: tuple) -> None: pass
2121
def getrandbits(self, k: int) -> int: pass
2222
def randrange(self, start: int, stop: Union[int, None] = None, step: int = 1) -> int: pass
2323
def randint(self, a: int, b: int) -> int: pass
24-
def choice(self, seq: Sequence[t]) -> t: pass
24+
def choice(self, seq: Sequence[_T]) -> _T: pass
2525
def shuffle(self, x: List[Any], random: Union[Function[[], float], None] = None) -> None: pass
26-
def sample(self, population: Union[Sequence[t], AbstractSet[t]], k: int) -> List[t]: pass
26+
def sample(self, population: Union[Sequence[_T], AbstractSet[_T]], k: int) -> List[_T]: pass
2727
def random(self) -> float: pass
2828
def uniform(self, a: float, b: float) -> float: pass
2929
def triangular(self, low: float = 0.0, high: float = 1.0,
@@ -52,9 +52,9 @@ def setstate(state: object) -> None: pass
5252
def getrandbits(k: int) -> int: pass
5353
def randrange(start: int, stop: Union[None, int] = None, step: int = 1) -> int: pass
5454
def randint(a: int, b: int) -> int: pass
55-
def choice(seq: Sequence[t]) -> t: pass
55+
def choice(seq: Sequence[_T]) -> _T: pass
5656
def shuffle(x: List[Any], random: Union[Function[[], float], None] = None) -> None: pass
57-
def sample(population: Union[Sequence[t], AbstractSet[t]], k: int) -> List[t]: pass
57+
def sample(population: Union[Sequence[_T], AbstractSet[_T]], k: int) -> List[_T]: pass
5858
def random() -> float: pass
5959
def uniform(a: float, b: float) -> float: pass
6060
def triangular(low: float = 0.0, high: float = 1.0,

‎stubs/3.2/unittest.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
)
1414
from abc import abstractmethod, ABCMeta
1515

16-
T = typevar('T')
17-
FT = typevar('FT')
16+
_T = typevar('_T')
17+
_FT = typevar('_FT')
1818

1919
class Testable(metaclass=ABCMeta):
2020
@abstractmethod
@@ -111,9 +111,9 @@ def assertIsNot(self, first: object, second: object,
111111
msg: object = None) -> None: pass
112112
def assertIsNone(self, expr: Any, msg: object = None) -> None: pass
113113
def assertIsNotNone(self, expr: Any, msg: object = None) -> None: pass
114-
def assertIn(self, first: T, second: Iterable[T],
114+
def assertIn(self, first: _T, second: Iterable[_T],
115115
msg: object = None) -> None: pass
116-
def assertNotIn(self, first: T, second: Iterable[T],
116+
def assertNotIn(self, first: _T, second: Iterable[_T],
117117
msg: object = None) -> None: pass
118118
def assertIsInstance(self, obj: Any, cls: type,
119119
msg: object = None) -> None: pass
@@ -159,7 +159,7 @@ class SkipTest(Exception):
159159
# TODO precise types
160160
def skipUnless(condition: Any, reason: str) -> Any: pass
161161
def skipIf(condition: Any, reason: str) -> Any: pass
162-
def expectedFailure(func: FT) -> FT: pass
162+
def expectedFailure(func: _FT) -> _FT: pass
163163
def skip(reason: str) -> Any: pass
164164

165165
def main(module: str = '__main__', defaultTest: str = None,

0 commit comments

Comments
 (0)