Skip to content

Commit 94f0db5

Browse files
committed
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).
1 parent c2111fd commit 94f0db5

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

tests/test_methods_and_attributes.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -433,18 +433,7 @@ def test_accepts_none(msg):
433433
assert m.ok_none4(None) == -1
434434

435435

436-
def test_casts_none(msg):
437-
"""#2778: implicit casting from None to object (not pointer)"""
438-
a = m.NoneCastTester()
439-
assert m.ok_obj_or_none(a) == -1
440-
a = m.NoneCastTester(4)
441-
assert m.ok_obj_or_none(a) == 4
442-
a = m.NoneCastTester(None)
443-
assert m.ok_obj_or_none(a) == -1
444-
assert m.ok_obj_or_none(None) == -1
445-
446-
447-
def test_casts_none(msg):
436+
def test_casts_none():
448437
"""#2778: implicit casting from None to object (not pointer)"""
449438
a = m.NoneCastTester()
450439
assert m.ok_obj_or_none(a) == -1

0 commit comments

Comments
 (0)