Repository navigation
Commit d198f38
committed
Add union math for intelligent indexing
This pull request hacks on supports for union math when using Unions of
Literals to index into tuples, NamedTuples, and TypedDicts.
It also fixes a bug I apparently introduced. Currently, mypy correctly
reports an error with this code:
class Test(TypedDict):
foo: int
t: Test
# Error: int can't be assigned a str value
t.setdefault("foo", "unrelated value")
...but does not report an error with:
key: Literal["foo"]
t.setdefault(key, "unrelated value")
This diff should make mypy report an error in both cases.
Resolves python#6262.1 parent dfcce2b commit d198f38
6 files changed
Lines changed: 259 additions & 91 deletions
File tree
- mypy
- plugins
- test-data/unit
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
2465 | 2466 | | |
2466 | 2467 | | |
2467 | 2468 | | |
2468 | | - | |
2469 | | - | |
2470 | | - | |
2471 | | - | |
2472 | | - | |
2473 | | - | |
2474 | | - | |
2475 | | - | |
2476 | | - | |
| 2469 | + | |
| 2470 | + | |
| 2471 | + | |
| 2472 | + | |
| 2473 | + | |
| 2474 | + | |
| 2475 | + | |
| 2476 | + | |
| 2477 | + | |
| 2478 | + | |
| 2479 | + | |
| 2480 | + | |
2477 | 2481 | | |
2478 | 2482 | | |
2479 | 2483 | | |
| |||
2489 | 2493 | | |
2490 | 2494 | | |
2491 | 2495 | | |
2492 | | - | |
2493 | | - | |
2494 | | - | |
| 2496 | + | |
| 2497 | + | |
| 2498 | + | |
2495 | 2499 | | |
2496 | 2500 | | |
2497 | | - | |
2498 | | - | |
| 2501 | + | |
| 2502 | + | |
2499 | 2503 | | |
| 2504 | + | |
2500 | 2505 | | |
2501 | 2506 | | |
2502 | | - | |
2503 | | - | |
| 2507 | + | |
| 2508 | + | |
2504 | 2509 | | |
| 2510 | + | |
2505 | 2511 | | |
2506 | 2512 | | |
2507 | | - | |
2508 | | - | |
| 2513 | + | |
| 2514 | + | |
2509 | 2515 | | |
| 2516 | + | |
2510 | 2517 | | |
2511 | | - | |
| 2518 | + | |
| 2519 | + | |
| 2520 | + | |
| 2521 | + | |
2512 | 2522 | | |
2513 | 2523 | | |
2514 | 2524 | | |
| |||
2521 | 2531 | | |
2522 | 2532 | | |
2523 | 2533 | | |
2524 | | - | |
| 2534 | + | |
2525 | 2535 | | |
2526 | | - | |
| 2536 | + | |
2527 | 2537 | | |
2528 | 2538 | | |
2529 | 2539 | | |
2530 | 2540 | | |
2531 | | - | |
| 2541 | + | |
2532 | 2542 | | |
2533 | 2543 | | |
2534 | 2544 | | |
2535 | 2545 | | |
2536 | | - | |
| 2546 | + | |
| 2547 | + | |
| 2548 | + | |
| 2549 | + | |
| 2550 | + | |
| 2551 | + | |
| 2552 | + | |
| 2553 | + | |
| 2554 | + | |
2537 | 2555 | | |
2538 | 2556 | | |
2539 | 2557 | | |
2540 | 2558 | | |
2541 | | - | |
| 2559 | + | |
2542 | 2560 | | |
2543 | 2561 | | |
2544 | | - | |
2545 | | - | |
2546 | 2562 | | |
2547 | | - | |
2548 | | - | |
| 2563 | + | |
| 2564 | + | |
2549 | 2565 | | |
2550 | | - | |
2551 | | - | |
| 2566 | + | |
2552 | 2567 | | |
2553 | | - | |
2554 | | - | |
2555 | | - | |
2556 | | - | |
2557 | | - | |
| 2568 | + | |
| 2569 | + | |
| 2570 | + | |
| 2571 | + | |
| 2572 | + | |
| 2573 | + | |
| 2574 | + | |
| 2575 | + | |
| 2576 | + | |
| 2577 | + | |
| 2578 | + | |
| 2579 | + | |
| 2580 | + | |
| 2581 | + | |
| 2582 | + | |
| 2583 | + | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
2558 | 2588 | | |
2559 | 2589 | | |
2560 | 2590 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1143 | 1143 | | |
1144 | 1144 | | |
1145 | 1145 | | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
1146 | 1154 | | |
1147 | 1155 | | |
1148 | 1156 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
120 | 131 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
129 | 135 | | |
130 | | - | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
171 | 172 | | |
172 | 173 | | |
173 | 174 | | |
174 | | - | |
175 | | - | |
| 175 | + | |
| 176 | + | |
176 | 177 | | |
177 | 178 | | |
178 | | - | |
179 | | - | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
180 | 186 | | |
181 | | - | |
| 187 | + | |
182 | 188 | | |
183 | 189 | | |
184 | 190 | | |
185 | 191 | | |
186 | 192 | | |
187 | 193 | | |
188 | | - | |
| 194 | + | |
189 | 195 | | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
194 | 203 | | |
195 | 204 | | |
196 | 205 | | |
| |||
228 | 237 | | |
229 | 238 | | |
230 | 239 | | |
231 | | - | |
232 | | - | |
| 240 | + | |
| 241 | + | |
233 | 242 | | |
234 | 243 | | |
235 | 244 | | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
248 | 262 | | |
249 | 263 | | |
250 | 264 | | |
| |||
273 | 287 | | |
274 | 288 | | |
275 | 289 | | |
276 | | - | |
277 | | - | |
278 | | - | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
279 | 294 | | |
280 | 295 | | |
281 | 296 | | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
288 | 319 | | |
289 | 320 | | |
290 | 321 | | |
| |||
299 | 330 | | |
300 | 331 | | |
301 | 332 | | |
302 | | - | |
303 | | - | |
| 333 | + | |
| 334 | + | |
304 | 335 | | |
305 | 336 | | |
306 | 337 | | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | | - | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
311 | 343 | | |
312 | 344 | | |
313 | 345 | | |
| |||
0 commit comments