Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-11-10 18:33:02 -02:00
parent c33074c8b9 66fbebfc26
commit 983a09a2d4
43 changed files with 493 additions and 481 deletions
--- a/_pytest/python_api.py
+++ b/_pytest/python_api.py
@@ -85,7 +85,7 @@ class ApproxNumpy(ApproxBase):

        try:
            actual = np.asarray(actual)
-        except:
+        except:  # noqa
            raise TypeError("cannot compare '{0}' to numpy.ndarray".format(actual))

        if actual.shape != self.expected.shape: