Commit b48e537
committed
Return NotImplemented from SortedSet set-algebra operators
`SortedSet.__and__`, `__or__`, `__sub__` and `__xor__` were aliased directly
to `intersection`/`union`/`difference`/`symmetric_difference`, so an
unsupported (non-iterable) right-hand operand raised `TypeError` from deep
inside the set operation instead of returning `NotImplemented`. That
prevented Python from falling back to the other operand's reflected operator
(e.g. an `Interval` type defining `__rand__`).
Give each operator an explicit implementation that returns `NotImplemented`
when the operand is not iterable and otherwise delegates to the existing
method, mirroring how the comparison operators already use
`__make_cmp`. Iterable operands (the existing, documented behavior) are
unchanged, and a plain non-iterable operand with no reflected operator still
ends up raising `TypeError` as before.
Closes #2191 parent 3ac3586 commit b48e537
2 files changed
Lines changed: 97 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
470 | 470 | | |
471 | 471 | | |
472 | 472 | | |
473 | | - | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
474 | 488 | | |
475 | 489 | | |
476 | 490 | | |
| |||
524 | 538 | | |
525 | 539 | | |
526 | 540 | | |
527 | | - | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
528 | 557 | | |
529 | 558 | | |
530 | 559 | | |
| |||
575 | 604 | | |
576 | 605 | | |
577 | 606 | | |
578 | | - | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
579 | 623 | | |
580 | 624 | | |
581 | 625 | | |
| |||
623 | 667 | | |
624 | 668 | | |
625 | 669 | | |
626 | | - | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
627 | 686 | | |
628 | 687 | | |
629 | 688 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
535 | 535 | | |
536 | 536 | | |
537 | 537 | | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
0 commit comments