floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a couple Python 2 __nonzero__ definitions 

It's called __bool__ in Python 3.
This commit is contained in:
Ran Benita 2020-05-01 11:39:38 +03:00
parent be68496440
commit 409ffcef17
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/mark/evaluate.py
View File

@ -38,8 +38,6 @@ class MarkEvaluator:
# don't cache here to prevent staleness # don't cache here to prevent staleness
return bool(self._get_marks()) return bool(self._get_marks())
__nonzero__ = __bool__
def wasvalid(self): def wasvalid(self):
return not hasattr(self, "exc") return not hasattr(self, "exc")

4
testing/test_assertrewrite.py
View File

@ -640,10 +640,10 @@ class TestAssertionRewrite:
assert getmsg(f) == "assert 5 <= 4" assert getmsg(f) == "assert 5 <= 4"
def test_assert_raising_nonzero_in_comparison(self): def test_assert_raising__bool__in_comparison(self):
def f(): def f():
class A: class A:
def __nonzero__(self): def __bool__(self):
raise ValueError(42) raise ValueError(42)
def __lt__(self, other): def __lt__(self, other):