From 94f0db58eef1f539b3f74265ffebb3e486228584 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 30 Jun 2021 13:29:33 -0700 Subject: [PATCH] Fixing merge accident related to merging PR #3059 from master. I did not go back to check when and why exactly this slipped in. Also removing unused `msg` (oversight in PR #3059). --- tests/test_methods_and_attributes.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tests/test_methods_and_attributes.py b/tests/test_methods_and_attributes.py index 8a4f8ec6c..655146e02 100644 --- a/tests/test_methods_and_attributes.py +++ b/tests/test_methods_and_attributes.py @@ -433,18 +433,7 @@ def test_accepts_none(msg): assert m.ok_none4(None) == -1 -def test_casts_none(msg): - """#2778: implicit casting from None to object (not pointer)""" - a = m.NoneCastTester() - assert m.ok_obj_or_none(a) == -1 - a = m.NoneCastTester(4) - assert m.ok_obj_or_none(a) == 4 - a = m.NoneCastTester(None) - assert m.ok_obj_or_none(a) == -1 - assert m.ok_obj_or_none(None) == -1 - - -def test_casts_none(msg): +def test_casts_none(): """#2778: implicit casting from None to object (not pointer)""" a = m.NoneCastTester() assert m.ok_obj_or_none(a) == -1