From 409ffcef177365d7de54df8a2b114b0c6cee5687 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 1 May 2020 11:39:38 +0300 Subject: [PATCH] Remove a couple Python 2 __nonzero__ definitions It's called __bool__ in Python 3. --- src/_pytest/mark/evaluate.py | 2 -- testing/test_assertrewrite.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/_pytest/mark/evaluate.py b/src/_pytest/mark/evaluate.py index 772baf31b..c47174e71 100644 --- a/src/_pytest/mark/evaluate.py +++ b/src/_pytest/mark/evaluate.py @@ -38,8 +38,6 @@ class MarkEvaluator: # don't cache here to prevent staleness return bool(self._get_marks()) - __nonzero__ = __bool__ - def wasvalid(self): return not hasattr(self, "exc") diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py index 8cf492966..726b6bdcc 100644 --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -640,10 +640,10 @@ class TestAssertionRewrite: assert getmsg(f) == "assert 5 <= 4" - def test_assert_raising_nonzero_in_comparison(self): + def test_assert_raising__bool__in_comparison(self): def f(): class A: - def __nonzero__(self): + def __bool__(self): raise ValueError(42) def __lt__(self, other):