From e1a8b8a419e0be20df288a6f1c54b05d2a57c603 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 10 Jan 2024 11:01:43 +0200 Subject: [PATCH 1/4] gh-113896: Suppress DeprecationWarning --- Lib/test/test_builtin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index e15492783aeec1..052760af528202 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -629,8 +629,9 @@ def __dir__(self): def test___ne__(self): self.assertFalse(None.__ne__(None)) - self.assertTrue(None.__ne__(0)) - self.assertTrue(None.__ne__("abc")) + with self.assertWarns(DeprecationWarning): + self.assertTrue(None.__ne__(0)) + self.assertTrue(None.__ne__("abc")) def test_divmod(self): self.assertEqual(divmod(12, 7), (1, 5)) From d2edb6ffc6c15f97eb475b6eb251d6837d587625 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 10 Jan 2024 15:41:47 +0200 Subject: [PATCH 2/4] Use assertWarnsRegex instead of assertWarns --- Lib/test/test_builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 052760af528202..ffd995aa3f89e0 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -629,7 +629,7 @@ def __dir__(self): def test___ne__(self): self.assertFalse(None.__ne__(None)) - with self.assertWarns(DeprecationWarning): + with self.assertWarnsRegex(DeprecationWarning, "NotImplemented should not be used in a boolean context"): self.assertTrue(None.__ne__(0)) self.assertTrue(None.__ne__("abc")) From bc5638310ae4ad284d98fb809c5524d1493321c1 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 10 Jan 2024 16:31:03 +0200 Subject: [PATCH 3/4] Apply suggestion from code review Co-authored-by: Nikita Sobolev --- Lib/test/test_builtin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index ffd995aa3f89e0..2b8779a7116b31 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -629,8 +629,10 @@ def __dir__(self): def test___ne__(self): self.assertFalse(None.__ne__(None)) - with self.assertWarnsRegex(DeprecationWarning, "NotImplemented should not be used in a boolean context"): + msg = "NotImplemented should not be used in a boolean context" + with self.assertWarnsRegex(DeprecationWarning, msg): self.assertTrue(None.__ne__(0)) + with self.assertWarnsRegex(DeprecationWarning, msg): self.assertTrue(None.__ne__("abc")) def test_divmod(self): From 6134f4c0ff754f32a6560f6803b81632d00f3b6e Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 10 Jan 2024 21:36:30 +0200 Subject: [PATCH 4/4] Use assertIs instead of assertWarnsRegex --- Lib/test/test_builtin.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 2b8779a7116b31..fcddd147bac63e 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -629,11 +629,8 @@ def __dir__(self): def test___ne__(self): self.assertFalse(None.__ne__(None)) - msg = "NotImplemented should not be used in a boolean context" - with self.assertWarnsRegex(DeprecationWarning, msg): - self.assertTrue(None.__ne__(0)) - with self.assertWarnsRegex(DeprecationWarning, msg): - self.assertTrue(None.__ne__("abc")) + self.assertIs(None.__ne__(0), NotImplemented) + self.assertIs(None.__ne__("abc"), NotImplemented) def test_divmod(self): self.assertEqual(divmod(12, 7), (1, 5))