https://github.com/python/cpython/commit/1a1e013a4a526546c373afd887f2e25eecc984ad
commit: 1a1e013a4a526546c373afd887f2e25eecc984ad
branch: main
author: Nikita Sobolev <[email protected]>
committer: sobolevn <[email protected]>
date: 2024-04-16T09:11:57Z
summary:
gh-117797: Improve `test_descr.test_not_implemented` (#117798)
files:
M Lib/test/test_descr.py
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 92db0886793261..93f66a721e8108 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4594,18 +4594,16 @@ def test_special_unbound_method_types(self):
def test_not_implemented(self):
# Testing NotImplemented...
# all binary methods should be able to return a NotImplemented
- import operator
def specialmethod(self, other):
return NotImplemented
def check(expr, x, y):
- try:
- exec(expr, {'x': x, 'y': y, 'operator': operator})
- except TypeError:
- pass
- else:
- self.fail("no TypeError from %r" % (expr,))
+ with (
+ self.subTest(expr=expr, x=x, y=y),
+ self.assertRaises(TypeError),
+ ):
+ exec(expr, {'x': x, 'y': y})
N1 = sys.maxsize + 1 # might trigger OverflowErrors instead of
# TypeErrors
@@ -4626,12 +4624,23 @@ def check(expr, x, y):
('__and__', 'x & y', 'x &= y'),
('__or__', 'x | y', 'x |= y'),
('__xor__', 'x ^ y', 'x ^= y')]:
- rname = '__r' + name[2:]
+ # Defines 'left' magic method:
A = type('A', (), {name: specialmethod})
a = A()
check(expr, a, a)
check(expr, a, N1)
check(expr, a, N2)
+ # Defines 'right' magic method:
+ rname = '__r' + name[2:]
+ B = type('B', (), {rname: specialmethod})
+ b = B()
+ check(expr, b, b)
+ check(expr, a, b)
+ check(expr, b, a)
+ check(expr, b, N1)
+ check(expr, b, N2)
+ check(expr, N1, b)
+ check(expr, N2, b)
if iexpr:
check(iexpr, a, a)
check(iexpr, a, N1)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
