p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python_api: reduce scope of a `except BaseException` in ApproxNumpy 

I'm not sure if it can even raise at all, but catching BaseException
would swallow ctrl-C and such and is definitely inappropriate here.
This commit is contained in:
Ran Benita 2020-05-12 12:07:56 +03:00
parent 23c9856857
commit 645aaa728d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/python_api.py
View File

@ -123,8 +123,10 @@ class ApproxNumpy(ApproxBase):
if not np.isscalar(actual): if not np.isscalar(actual):
try: try:
actual = np.asarray(actual) actual = np.asarray(actual)
except BaseException: except Exception as e:
raise TypeError("cannot compare '{}' to numpy.ndarray".format(actual)) raise TypeError(
"cannot compare '{}' to numpy.ndarray".format(actual)
) from e
if not np.isscalar(actual) and actual.shape != self.expected.shape: if not np.isscalar(actual) and actual.shape != self.expected.shape:
return False return False