Repository navigation
Commit 1d6905a
authored
Fix various bugs in TypeVarTuples with defaults (#21544)
Fixes a bunch of TODOs in tests.
Fixes #20449
Couple non-trivial things here:
First, I prohibit (regular) type variables with defaults that appear
after a `TypeVarTuple`. The PEP and the spec are clear that these are
ambiguous and invalid. But, because they are ambiguous, we can't simply
give the error, since otherwise various parts of code will behave in
weirdly inconsistent ways. Therefore, I completely erase ambiguous type
variables out of existence, 1984 style.
Second, couple commented-out tests cases suggested that `TypeVarTuple`
defaults should be used in cases where `*tuple[()]` would be used as a
value otherwise, plus `Foo[X, Y]` and `Foo[X, Y, *tuple[()]]` should be
interpreted differently. I don't see anything about this in the
PEP/spec, and I don't like this. I think the default should be used
_only_ in cases where `Any` or `Never` would be used otherwise.1 parent 8f4c840 commit 1d6905a
5 files changed
Lines changed: 125 additions & 56 deletions
File tree
- mypy
- test-data/unit
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
| 184 | + | |
184 | 185 | | |
185 | 186 | | |
186 | 187 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
546 | 546 | | |
547 | 547 | | |
548 | 548 | | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
549 | 554 | | |
550 | | - | |
| 555 | + | |
551 | 556 | | |
552 | 557 | | |
553 | 558 | | |
| |||
1836 | 1841 | | |
1837 | 1842 | | |
1838 | 1843 | | |
1839 | | - | |
| 1844 | + | |
1840 | 1845 | | |
| 1846 | + | |
1841 | 1847 | | |
1842 | 1848 | | |
1843 | 1849 | | |
| |||
2084 | 2090 | | |
2085 | 2091 | | |
2086 | 2092 | | |
2087 | | - | |
| 2093 | + | |
| 2094 | + | |
| 2095 | + | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
2088 | 2108 | | |
2089 | 2109 | | |
2090 | 2110 | | |
| |||
4017 | 4037 | | |
4018 | 4038 | | |
4019 | 4039 | | |
| 4040 | + | |
| 4041 | + | |
| 4042 | + | |
| 4043 | + | |
| 4044 | + | |
| 4045 | + | |
| 4046 | + | |
| 4047 | + | |
| 4048 | + | |
| 4049 | + | |
| 4050 | + | |
| 4051 | + | |
| 4052 | + | |
| 4053 | + | |
| 4054 | + | |
| 4055 | + | |
| 4056 | + | |
| 4057 | + | |
| 4058 | + | |
| 4059 | + | |
| 4060 | + | |
| 4061 | + | |
4020 | 4062 | | |
4021 | 4063 | | |
4022 | 4064 | | |
| |||
4029 | 4071 | | |
4030 | 4072 | | |
4031 | 4073 | | |
| 4074 | + | |
4032 | 4075 | | |
4033 | 4076 | | |
4034 | 4077 | | |
4035 | 4078 | | |
4036 | | - | |
4037 | | - | |
4038 | | - | |
4039 | | - | |
4040 | | - | |
4041 | | - | |
4042 | | - | |
4043 | | - | |
4044 | | - | |
4045 | | - | |
4046 | 4079 | | |
4047 | 4080 | | |
4048 | 4081 | | |
| |||
7792 | 7825 | | |
7793 | 7826 | | |
7794 | 7827 | | |
| 7828 | + | |
7795 | 7829 | | |
7796 | 7830 | | |
7797 | 7831 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
| 157 | + | |
157 | 158 | | |
158 | 159 | | |
159 | 160 | | |
| |||
174 | 175 | | |
175 | 176 | | |
176 | 177 | | |
| 178 | + | |
177 | 179 | | |
178 | 180 | | |
179 | 181 | | |
| |||
220 | 222 | | |
221 | 223 | | |
222 | 224 | | |
| 225 | + | |
223 | 226 | | |
224 | 227 | | |
225 | 228 | | |
| |||
240 | 243 | | |
241 | 244 | | |
242 | 245 | | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
243 | 251 | | |
244 | 252 | | |
245 | 253 | | |
| |||
403 | 411 | | |
404 | 412 | | |
405 | 413 | | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
406 | 421 | | |
407 | 422 | | |
408 | 423 | | |
| |||
2108 | 2123 | | |
2109 | 2124 | | |
2110 | 2125 | | |
2111 | | - | |
| 2126 | + | |
| 2127 | + | |
| 2128 | + | |
| 2129 | + | |
2112 | 2130 | | |
2113 | 2131 | | |
2114 | 2132 | | |
| |||
2117 | 2135 | | |
2118 | 2136 | | |
2119 | 2137 | | |
2120 | | - | |
| 2138 | + | |
2121 | 2139 | | |
2122 | 2140 | | |
| 2141 | + | |
2123 | 2142 | | |
2124 | 2143 | | |
2125 | 2144 | | |
| |||
2152 | 2171 | | |
2153 | 2172 | | |
2154 | 2173 | | |
2155 | | - | |
2156 | | - | |
2157 | | - | |
2158 | | - | |
2159 | | - | |
2160 | | - | |
| 2174 | + | |
| 2175 | + | |
| 2176 | + | |
| 2177 | + | |
| 2178 | + | |
| 2179 | + | |
| 2180 | + | |
| 2181 | + | |
| 2182 | + | |
| 2183 | + | |
| 2184 | + | |
| 2185 | + | |
| 2186 | + | |
| 2187 | + | |
| 2188 | + | |
| 2189 | + | |
2161 | 2190 | | |
2162 | 2191 | | |
2163 | 2192 | | |
2164 | | - | |
| 2193 | + | |
| 2194 | + | |
2165 | 2195 | | |
2166 | 2196 | | |
2167 | 2197 | | |
| |||
2380 | 2410 | | |
2381 | 2411 | | |
2382 | 2412 | | |
2383 | | - | |
2384 | | - | |
| 2413 | + | |
2385 | 2414 | | |
2386 | | - | |
2387 | | - | |
2388 | | - | |
2389 | | - | |
2390 | | - | |
2391 | | - | |
| 2415 | + | |
| 2416 | + | |
| 2417 | + | |
| 2418 | + | |
| 2419 | + | |
| 2420 | + | |
| 2421 | + | |
| 2422 | + | |
| 2423 | + | |
| 2424 | + | |
| 2425 | + | |
| 2426 | + | |
| 2427 | + | |
| 2428 | + | |
2392 | 2429 | | |
2393 | 2430 | | |
2394 | 2431 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
| 143 | + | |
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| |||
195 | 195 | | |
196 | 196 | | |
197 | 197 | | |
198 | | - | |
| 198 | + | |
199 | 199 | | |
200 | 200 | | |
201 | 201 | | |
| |||
250 | 250 | | |
251 | 251 | | |
252 | 252 | | |
253 | | - | |
| 253 | + | |
254 | 254 | | |
255 | 255 | | |
256 | 256 | | |
| |||
0 commit comments