Repository navigation
Commit 32802c7
committed
Make overloads respect keyword-only args
This commit resolves python#1907.
Specifically, it turned out that support for non-positional args in
overload was never implemented to begin with. Thankfully, it also turned
out the bulk of the logic we wanted was already implemented within
`mypy.subtypes.is_callable_subtype`. Rather then re-implementing that
code, this commit refactors that method to support any kind of check,
instead of specifically subtype checks.
This, as a side-effect, ended up making some partial progress towards
python#4159 -- this is because unlike
the existing checks, `mypy.subtypes.is_callable_subtype` *doesn't* erase
types and has better support for typevars in general.
The reason this commit does not fully remove type erasure from overload
checks is because the new implementation still calls
`mypy.meet.is_overlapping_types` which *does* perform erasure. But
fixing that seemed out-of-scope for this commit, so I stopped here.1 parent af7e834 commit 32802c7
5 files changed
Lines changed: 139 additions & 90 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
437 | 437 | | |
438 | 438 | | |
439 | 439 | | |
440 | | - | |
| 440 | + | |
| 441 | + | |
441 | 442 | | |
442 | 443 | | |
443 | 444 | | |
| |||
3530 | 3531 | | |
3531 | 3532 | | |
3532 | 3533 | | |
3533 | | - | |
3534 | | - | |
3535 | | - | |
3536 | 3534 | | |
| 3535 | + | |
3537 | 3536 | | |
3538 | 3537 | | |
3539 | | - | |
| 3538 | + | |
3540 | 3539 | | |
3541 | 3540 | | |
3542 | 3541 | | |
3543 | | - | |
3544 | | - | |
3545 | | - | |
3546 | | - | |
3547 | | - | |
3548 | | - | |
3549 | | - | |
| 3542 | + | |
| 3543 | + | |
| 3544 | + | |
| 3545 | + | |
| 3546 | + | |
| 3547 | + | |
| 3548 | + | |
| 3549 | + | |
| 3550 | + | |
| 3551 | + | |
| 3552 | + | |
| 3553 | + | |
3550 | 3554 | | |
3551 | 3555 | | |
3552 | 3556 | | |
3553 | 3557 | | |
3554 | 3558 | | |
| 3559 | + | |
3555 | 3560 | | |
3556 | 3561 | | |
3557 | 3562 | | |
3558 | 3563 | | |
| 3564 | + | |
3559 | 3565 | | |
3560 | | - | |
3561 | | - | |
3562 | | - | |
| 3566 | + | |
| 3567 | + | |
| 3568 | + | |
3563 | 3569 | | |
| 3570 | + | |
| 3571 | + | |
| 3572 | + | |
3564 | 3573 | | |
3565 | 3574 | | |
3566 | 3575 | | |
| |||
3569 | 3578 | | |
3570 | 3579 | | |
3571 | 3580 | | |
3572 | | - | |
3573 | 3581 | | |
3574 | 3582 | | |
3575 | | - | |
3576 | | - | |
3577 | | - | |
| 3583 | + | |
| 3584 | + | |
| 3585 | + | |
3578 | 3586 | | |
3579 | 3587 | | |
3580 | 3588 | | |
| |||
3583 | 3591 | | |
3584 | 3592 | | |
3585 | 3593 | | |
3586 | | - | |
3587 | | - | |
3588 | | - | |
3589 | | - | |
3590 | | - | |
3591 | | - | |
3592 | | - | |
3593 | | - | |
3594 | | - | |
3595 | | - | |
3596 | | - | |
3597 | | - | |
3598 | | - | |
3599 | | - | |
3600 | | - | |
3601 | | - | |
3602 | | - | |
3603 | | - | |
3604 | | - | |
3605 | | - | |
3606 | | - | |
3607 | | - | |
3608 | | - | |
3609 | 3594 | | |
3610 | 3595 | | |
3611 | 3596 | | |
| |||
3621 | 3606 | | |
3622 | 3607 | | |
3623 | 3608 | | |
3624 | | - | |
3625 | | - | |
3626 | | - | |
| 3609 | + | |
| 3610 | + | |
| 3611 | + | |
| 3612 | + | |
| 3613 | + | |
3627 | 3614 | | |
3628 | 3615 | | |
3629 | 3616 | | |
3630 | 3617 | | |
3631 | 3618 | | |
3632 | 3619 | | |
3633 | 3620 | | |
3634 | | - | |
3635 | | - | |
3636 | | - | |
3637 | 3621 | | |
3638 | | - | |
3639 | | - | |
3640 | | - | |
3641 | | - | |
3642 | | - | |
3643 | | - | |
| 3622 | + | |
| 3623 | + | |
| 3624 | + | |
3644 | 3625 | | |
3645 | 3626 | | |
3646 | 3627 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
525 | 525 | | |
526 | 526 | | |
527 | 527 | | |
528 | | - | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
529 | 531 | | |
530 | 532 | | |
531 | 533 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
202 | 202 | | |
203 | 203 | | |
204 | 204 | | |
205 | | - | |
| 205 | + | |
206 | 206 | | |
| 207 | + | |
207 | 208 | | |
208 | 209 | | |
209 | 210 | | |
| |||
309 | 310 | | |
310 | 311 | | |
311 | 312 | | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
316 | 319 | | |
317 | 320 | | |
318 | 321 | | |
| |||
562 | 565 | | |
563 | 566 | | |
564 | 567 | | |
565 | | - | |
566 | | - | |
567 | | - | |
568 | | - | |
569 | | - | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
570 | 575 | | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
575 | 584 | | |
576 | 585 | | |
577 | 586 | | |
| |||
604 | 613 | | |
605 | 614 | | |
606 | 615 | | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
607 | 619 | | |
608 | 620 | | |
609 | 621 | | |
| |||
658 | 670 | | |
659 | 671 | | |
660 | 672 | | |
661 | | - | |
| 673 | + | |
662 | 674 | | |
663 | 675 | | |
664 | 676 | | |
| |||
681 | 693 | | |
682 | 694 | | |
683 | 695 | | |
684 | | - | |
| 696 | + | |
685 | 697 | | |
686 | 698 | | |
687 | 699 | | |
| |||
690 | 702 | | |
691 | 703 | | |
692 | 704 | | |
693 | | - | |
| 705 | + | |
694 | 706 | | |
695 | 707 | | |
696 | 708 | | |
| |||
742 | 754 | | |
743 | 755 | | |
744 | 756 | | |
745 | | - | |
| 757 | + | |
746 | 758 | | |
747 | 759 | | |
748 | 760 | | |
| |||
753 | 765 | | |
754 | 766 | | |
755 | 767 | | |
756 | | - | |
757 | | - | |
758 | | - | |
759 | | - | |
760 | | - | |
761 | | - | |
| 768 | + | |
| 769 | + | |
762 | 770 | | |
763 | 771 | | |
764 | 772 | | |
765 | 773 | | |
766 | 774 | | |
767 | 775 | | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
768 | 782 | | |
769 | 783 | | |
770 | 784 | | |
| |||
907 | 921 | | |
908 | 922 | | |
909 | 923 | | |
910 | | - | |
911 | | - | |
912 | | - | |
913 | | - | |
| 924 | + | |
914 | 925 | | |
915 | 926 | | |
916 | 927 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
773 | 773 | | |
774 | 774 | | |
775 | 775 | | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
776 | 783 | | |
777 | 784 | | |
778 | 785 | | |
| |||
0 commit comments