Skip to content

Commit a7f13cc

Browse files
spkerstenspkersten
committed
Made local type vars in typing.py stubs private
1 parent 2d1382c commit a7f13cc

File tree

2 files changed

+81
-81
lines changed

2 files changed

+81
-81
lines changed

‎stubs/2.7/typing.py

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ def __getitem__(self, typeargs):
3939

4040
# Abstract base classes.
4141

42-
T = typevar('T')
43-
KT = typevar('KT')
44-
VT = typevar('VT')
42+
_T = typevar('_T')
43+
_KT = typevar('_KT')
44+
_VT = typevar('_VT')
4545

4646
# TODO Container etc.
4747

@@ -53,113 +53,113 @@ class SupportsFloat(metaclass=ABCMeta):
5353
@abstractmethod
5454
def __float__(self) -> float: pass
5555

56-
class SupportsAbs(AbstractGeneric[T]):
56+
class SupportsAbs(AbstractGeneric[_T]):
5757
@abstractmethod
58-
def __abs__(self) -> T: pass
58+
def __abs__(self) -> _T: pass
5959

6060
@disjointclass(int)
6161
@disjointclass(float)
62-
class SupportsRound(AbstractGeneric[T]):
62+
class SupportsRound(AbstractGeneric[_T]):
6363
@abstractmethod
64-
def __round__(self, ndigits: int = 0) -> T: pass
64+
def __round__(self, ndigits: int = 0) -> _T: pass
6565

66-
class Reversible(AbstractGeneric[T]):
66+
class Reversible(AbstractGeneric[_T]):
6767
@abstractmethod
68-
def __reversed__(self) -> Iterator[T]: pass
68+
def __reversed__(self) -> Iterator[_T]: pass
6969

7070
class Sized(metaclass=ABCMeta):
7171
@abstractmethod
7272
def __len__(self) -> int: pass
7373

74-
class Iterable(AbstractGeneric[T]):
74+
class Iterable(AbstractGeneric[_T]):
7575
@abstractmethod
76-
def __iter__(self) -> Iterator[T]: pass
76+
def __iter__(self) -> Iterator[_T]: pass
7777

78-
class Iterator(Iterable[T], AbstractGeneric[T]):
78+
class Iterator(Iterable[_T], AbstractGeneric[_T]):
7979
@abstractmethod
80-
def next(self) -> T: pass
80+
def next(self) -> _T: pass
8181

82-
class Sequence(Sized, Iterable[T], AbstractGeneric[T]):
82+
class Sequence(Sized, Iterable[_T], AbstractGeneric[_T]):
8383
@abstractmethod
8484
def __contains__(self, x: object) -> bool: pass
8585
@overload
8686
@abstractmethod
87-
def __getitem__(self, i: int) -> T: pass
87+
def __getitem__(self, i: int) -> _T: pass
8888
@overload
8989
@abstractmethod
90-
def __getitem__(self, s: slice) -> Sequence[T]: pass
90+
def __getitem__(self, s: slice) -> Sequence[_T]: pass
9191

92-
class AbstractSet(Sized, Iterable[T], AbstractGeneric[T]):
92+
class AbstractSet(Sized, Iterable[_T], AbstractGeneric[_T]):
9393
@abstractmethod
9494
def __contains__(self, x: object) -> bool: pass
9595
# TODO __le__, __lt__, __gt__, __ge__
9696
@abstractmethod
97-
def __and__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
97+
def __and__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
9898
@abstractmethod
99-
def __or__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
99+
def __or__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
100100
@abstractmethod
101-
def __sub__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
101+
def __sub__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
102102
@abstractmethod
103-
def __xor__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
103+
def __xor__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
104104
# TODO argument can be any container?
105105
@abstractmethod
106-
def isdisjoint(self, s: AbstractSet[T]) -> bool: pass
106+
def isdisjoint(self, s: AbstractSet[_T]) -> bool: pass
107107

108-
class Mapping(Sized, Iterable[KT], AbstractGeneric[KT, VT]):
108+
class Mapping(Sized, Iterable[_KT], AbstractGeneric[_KT, _VT]):
109109
@abstractmethod
110-
def __getitem__(self, k: KT) -> VT: pass
110+
def __getitem__(self, k: _KT) -> _VT: pass
111111
@abstractmethod
112-
def __setitem__(self, k: KT, v: VT) -> None: pass
112+
def __setitem__(self, k: _KT, v: _VT) -> None: pass
113113
@abstractmethod
114-
def __delitem__(self, v: KT) -> None: pass
114+
def __delitem__(self, v: _KT) -> None: pass
115115
@abstractmethod
116116
def __contains__(self, o: object) -> bool: pass
117117

118118
@abstractmethod
119119
def clear(self) -> None: pass
120120
@abstractmethod
121-
def copy(self) -> Mapping[KT, VT]: pass
121+
def copy(self) -> Mapping[_KT, _VT]: pass
122122
@overload
123123
@abstractmethod
124-
def get(self, k: KT) -> VT: pass
124+
def get(self, k: _KT) -> _VT: pass
125125
@overload
126126
@abstractmethod
127-
def get(self, k: KT, default: VT) -> VT: pass
127+
def get(self, k: _KT, default: _VT) -> _VT: pass
128128
@overload
129129
@abstractmethod
130-
def pop(self, k: KT) -> VT: pass
130+
def pop(self, k: _KT) -> _VT: pass
131131
@overload
132132
@abstractmethod
133-
def pop(self, k: KT, default: VT) -> VT: pass
133+
def pop(self, k: _KT, default: _VT) -> _VT: pass
134134
@abstractmethod
135-
def popitem(self) -> Tuple[KT, VT]: pass
135+
def popitem(self) -> Tuple[_KT, _VT]: pass
136136
@overload
137137
@abstractmethod
138-
def setdefault(self, k: KT) -> VT: pass
138+
def setdefault(self, k: _KT) -> _VT: pass
139139
@overload
140140
@abstractmethod
141-
def setdefault(self, k: KT, default: VT) -> VT: pass
141+
def setdefault(self, k: _KT, default: _VT) -> _VT: pass
142142

143143
# TODO keyword arguments
144144
@overload
145145
@abstractmethod
146-
def update(self, m: Mapping[KT, VT]) -> None: pass
146+
def update(self, m: Mapping[_KT, _VT]) -> None: pass
147147
@overload
148148
@abstractmethod
149-
def update(self, m: Iterable[Tuple[KT, VT]]) -> None: pass
149+
def update(self, m: Iterable[Tuple[_KT, _VT]]) -> None: pass
150150

151151
@abstractmethod
152-
def keys(self) -> list[KT]: pass
152+
def keys(self) -> list[_KT]: pass
153153
@abstractmethod
154-
def values(self) -> list[VT]: pass
154+
def values(self) -> list[_VT]: pass
155155
@abstractmethod
156-
def items(self) -> list[Tuple[KT, VT]]: pass
156+
def items(self) -> list[Tuple[_KT, _VT]]: pass
157157
@abstractmethod
158-
def iterkeys(self) -> Iterator[KT]: pass
158+
def iterkeys(self) -> Iterator[_KT]: pass
159159
@abstractmethod
160-
def itervalues(self) -> Iterator[VT]: pass
160+
def itervalues(self) -> Iterator[_VT]: pass
161161
@abstractmethod
162-
def iteritems(self) -> Iterator[Tuple[KT, VT]]: pass
162+
def iteritems(self) -> Iterator[Tuple[_KT, _VT]]: pass
163163

164164
class IO(Iterable[AnyStr], AbstractGeneric[AnyStr]):
165165
# TODO detach

‎stubs/3.2/typing.py

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ def __getitem__(self, typeargs):
3939

4040
# Abstract base classes.
4141

42-
T = typevar('T')
43-
KT = typevar('KT')
44-
VT = typevar('VT')
42+
_T = typevar('_T')
43+
_KT = typevar('_KT')
44+
_VT = typevar('_VT')
4545

4646
# TODO Container etc.
4747

@@ -53,43 +53,43 @@ class SupportsFloat(metaclass=ABCMeta):
5353
@abstractmethod
5454
def __float__(self) -> float: pass
5555

56-
class SupportsAbs(AbstractGeneric[T]):
56+
class SupportsAbs(AbstractGeneric[_T]):
5757
@abstractmethod
58-
def __abs__(self) -> T: pass
58+
def __abs__(self) -> _T: pass
5959

6060
@disjointclass(int)
6161
@disjointclass(float)
62-
class SupportsRound(AbstractGeneric[T]):
62+
class SupportsRound(AbstractGeneric[_T]):
6363
@abstractmethod
64-
def __round__(self, ndigits: int = 0) -> T: pass
64+
def __round__(self, ndigits: int = 0) -> _T: pass
6565

66-
class Reversible(AbstractGeneric[T]):
66+
class Reversible(AbstractGeneric[_T]):
6767
@abstractmethod
68-
def __reversed__(self) -> Iterator[T]: pass
68+
def __reversed__(self) -> Iterator[_T]: pass
6969

7070
class Sized(metaclass=ABCMeta):
7171
@abstractmethod
7272
def __len__(self) -> int: pass
7373

74-
class Iterable(AbstractGeneric[T]):
74+
class Iterable(AbstractGeneric[_T]):
7575
@abstractmethod
76-
def __iter__(self) -> Iterator[T]: pass
76+
def __iter__(self) -> Iterator[_T]: pass
7777

78-
class Iterator(Iterable[T], AbstractGeneric[T]):
78+
class Iterator(Iterable[_T], AbstractGeneric[_T]):
7979
@abstractmethod
80-
def __next__(self) -> T: pass
80+
def __next__(self) -> _T: pass
8181

82-
class Sequence(Iterable[T], Sized, AbstractGeneric[T]):
82+
class Sequence(Iterable[_T], Sized, AbstractGeneric[_T]):
8383
@abstractmethod
8484
def __contains__(self, x: object) -> bool: pass
8585
@overload
8686
@abstractmethod
87-
def __getitem__(self, i: int) -> T: pass
87+
def __getitem__(self, i: int) -> _T: pass
8888
@overload
8989
@abstractmethod
90-
def __getitem__(self, s: slice) -> Sequence[T]: pass
90+
def __getitem__(self, s: slice) -> Sequence[_T]: pass
9191

92-
class AbstractSet(Iterable[T], Sized, AbstractGeneric[T]):
92+
class AbstractSet(Iterable[_T], Sized, AbstractGeneric[_T]):
9393
@abstractmethod
9494
def __contains__(self, x: object) -> bool: pass
9595
@abstractmethod
@@ -101,69 +101,69 @@ def __gt__(self, s: AbstractSet[Any]) -> bool: pass
101101
@abstractmethod
102102
def __ge__(self, s: AbstractSet[Any]) -> bool: pass
103103
@abstractmethod
104-
def __and__(self, s: AbstractSet[Any]) -> AbstractSet[T]: pass
105-
# In order to support covariance, T should not be used within an argument
104+
def __and__(self, s: AbstractSet[Any]) -> AbstractSet[_T]: pass
105+
# In order to support covariance,_T should not be used within an argument
106106
# type. We need union types to properly model this.
107107
@abstractmethod
108-
def __or__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
108+
def __or__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
109109
@abstractmethod
110-
def __sub__(self, s: AbstractSet[Any]) -> AbstractSet[T]: pass
110+
def __sub__(self, s: AbstractSet[Any]) -> AbstractSet[_T]: pass
111111
@abstractmethod
112-
def __xor__(self, s: AbstractSet[T]) -> AbstractSet[T]: pass
112+
def __xor__(self, s: AbstractSet[_T]) -> AbstractSet[_T]: pass
113113
# TODO argument can be any container?
114114
@abstractmethod
115115
def isdisjoint(self, s: AbstractSet[Any]) -> bool: pass
116116

117-
class Mapping(Iterable[KT], Sized, AbstractGeneric[KT, VT]):
117+
class Mapping(Iterable[_KT], Sized, AbstractGeneric[_KT, _VT]):
118118
@abstractmethod
119-
def __getitem__(self, k: KT) -> VT: pass
119+
def __getitem__(self, k: _KT) -> _VT: pass
120120
@abstractmethod
121-
def __setitem__(self, k: KT, v: VT) -> None: pass
121+
def __setitem__(self, k: _KT, v: _VT) -> None: pass
122122
@abstractmethod
123-
def __delitem__(self, v: KT) -> None: pass
123+
def __delitem__(self, v: _KT) -> None: pass
124124
@abstractmethod
125125
def __contains__(self, o: object) -> bool: pass
126126

127127
@abstractmethod
128128
def clear(self) -> None: pass
129129
@abstractmethod
130-
def copy(self) -> Mapping[KT, VT]: pass
130+
def copy(self) -> Mapping[_KT, _VT]: pass
131131
@overload
132132
@abstractmethod
133-
def get(self, k: KT) -> VT: pass
133+
def get(self, k: _KT) -> _VT: pass
134134
@overload
135135
@abstractmethod
136-
def get(self, k: KT, default: VT) -> VT: pass
136+
def get(self, k: _KT, default: _VT) -> _VT: pass
137137
@overload
138138
@abstractmethod
139-
def pop(self, k: KT) -> VT: pass
139+
def pop(self, k: _KT) -> _VT: pass
140140
@overload
141141
@abstractmethod
142-
def pop(self, k: KT, default: VT) -> VT: pass
142+
def pop(self, k: _KT, default: _VT) -> _VT: pass
143143
@abstractmethod
144-
def popitem(self) -> Tuple[KT, VT]: pass
144+
def popitem(self) -> Tuple[_KT, _VT]: pass
145145
@overload
146146
@abstractmethod
147-
def setdefault(self, k: KT) -> VT: pass
147+
def setdefault(self, k: _KT) -> _VT: pass
148148
@overload
149149
@abstractmethod
150-
def setdefault(self, k: KT, default: VT) -> VT: pass
150+
def setdefault(self, k: _KT, default: _VT) -> _VT: pass
151151

152152
# TODO keyword arguments
153153
@overload
154154
@abstractmethod
155-
def update(self, m: Mapping[KT, VT]) -> None: pass
155+
def update(self, m: Mapping[_KT, _VT]) -> None: pass
156156
@overload
157157
@abstractmethod
158-
def update(self, m: Iterable[Tuple[KT, VT]]) -> None: pass
158+
def update(self, m: Iterable[Tuple[_KT, _VT]]) -> None: pass
159159

160160
# TODO use views for the return values instead
161161
@abstractmethod
162-
def keys(self) -> AbstractSet[KT]: pass
162+
def keys(self) -> AbstractSet[_KT]: pass
163163
@abstractmethod
164-
def values(self) -> AbstractSet[VT]: pass
164+
def values(self) -> AbstractSet[_VT]: pass
165165
@abstractmethod
166-
def items(self) -> AbstractSet[Tuple[KT, VT]]: pass
166+
def items(self) -> AbstractSet[Tuple[_KT, _VT]]: pass
167167

168168
class IO(Iterable[AnyStr], AbstractGeneric[AnyStr]):
169169
# TODO detach

0 commit comments

Comments
 (0)