From d80c9ce6c3a713cb5ca29b5ce289f0360c59557b Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 30 Jul 2023 19:14:44 +0200 Subject: [PATCH] Backport PR #26414: Fixes for pycodestyle v2.11 (cherry picked from commit f7a8cabc1cf1ac9b35502f08e764d74d07d865ac) --- examples/misc/packed_bubbles.py | 3 +-- lib/matplotlib/dviread.py | 2 +- lib/matplotlib/font_manager.py | 2 +- lib/matplotlib/tests/test_axes.py | 4 ++-- lib/matplotlib/tests/test_cbook.py | 6 +++--- lib/matplotlib/tests/test_image.py | 2 +- lib/matplotlib/tests/test_scale.py | 8 ++++---- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/examples/misc/packed_bubbles.py b/examples/misc/packed_bubbles.py index 12f51e9569cb..65ec206899ab 100644 --- a/examples/misc/packed_bubbles.py +++ b/examples/misc/packed_bubbles.py @@ -76,8 +76,7 @@ def check_collisions(self, bubble, bubbles): def collides_with(self, bubble, bubbles): distance = self.outline_distance(bubble, bubbles) - idx_min = np.argmin(distance) - return idx_min if type(idx_min) == np.ndarray else [idx_min] + return np.argmin(distance, keepdims=True) def collapse(self, n_iterations=50): """ diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py index cbd3b542a003..a37a60613903 100644 --- a/lib/matplotlib/dviread.py +++ b/lib/matplotlib/dviread.py @@ -622,7 +622,7 @@ def __init__(self, scale, tfm, texname, vf): for char in range(nchars)] def __eq__(self, other): - return (type(self) == type(other) + return (type(self) is type(other) and self.texname == other.texname and self.size == other.size) def __ne__(self, other): diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index 7f958089f3e4..e570add89271 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -851,7 +851,7 @@ def set_fontconfig_pattern(self, pattern): pattern syntax for use here. """ for key, val in parse_fontconfig_pattern(pattern).items(): - if type(val) == list: + if type(val) is list: getattr(self, "set_" + key)(val[0]) else: getattr(self, "set_" + key)(val) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index cef1c76af666..cf33d31c6f77 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -2834,12 +2834,12 @@ def _as_mpl_axes(self): # testing axes creation with plt.axes ax = plt.axes([0, 0, 1, 1], projection=prj) - assert type(ax) == PolarAxes + assert type(ax) is PolarAxes plt.close() # testing axes creation with subplot ax = plt.subplot(121, projection=prj) - assert type(ax) == PolarAxes + assert type(ax) is PolarAxes plt.close() diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py index 3a70358e2530..39868e5dcb8b 100644 --- a/lib/matplotlib/tests/test_cbook.py +++ b/lib/matplotlib/tests/test_cbook.py @@ -224,7 +224,7 @@ def test_callback_complete(self, pickle): # test that we can add a callback cid1 = self.connect(self.signal, mini_me.dummy, pickle) - assert type(cid1) == int + assert type(cid1) is int self.is_not_empty() # test that we don't add a second callback @@ -249,7 +249,7 @@ def test_callback_disconnect(self, pickle): # test that we can add a callback cid1 = self.connect(self.signal, mini_me.dummy, pickle) - assert type(cid1) == int + assert type(cid1) is int self.is_not_empty() self.disconnect(cid1) @@ -267,7 +267,7 @@ def test_callback_wrong_disconnect(self, pickle): # test that we can add a callback cid1 = self.connect(self.signal, mini_me.dummy, pickle) - assert type(cid1) == int + assert type(cid1) is int self.is_not_empty() self.disconnect("foo") diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 2860a558d83e..9198c2b91994 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -1461,6 +1461,6 @@ def test_str_norms(fig_test, fig_ref): axrs[3].imshow(t, norm=colors.SymLogNorm(linthresh=2, vmin=.3, vmax=.7)) axrs[4].imshow(t, norm="logit", clim=(.3, .7)) - assert type(axts[0].images[0].norm) == colors.LogNorm # Exactly that class + assert type(axts[0].images[0].norm) is colors.LogNorm # Exactly that class with pytest.raises(ValueError): axts[0].imshow(t, norm="foobar") diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py index 7f1130560581..727397367762 100644 --- a/lib/matplotlib/tests/test_scale.py +++ b/lib/matplotlib/tests/test_scale.py @@ -37,22 +37,22 @@ def test_symlog_mask_nan(): x = np.arange(-1.5, 5, 0.5) out = slti.transform_non_affine(slt.transform_non_affine(x)) assert_allclose(out, x) - assert type(out) == type(x) + assert type(out) is type(x) x[4] = np.nan out = slti.transform_non_affine(slt.transform_non_affine(x)) assert_allclose(out, x) - assert type(out) == type(x) + assert type(out) is type(x) x = np.ma.array(x) out = slti.transform_non_affine(slt.transform_non_affine(x)) assert_allclose(out, x) - assert type(out) == type(x) + assert type(out) is type(x) x[3] = np.ma.masked out = slti.transform_non_affine(slt.transform_non_affine(x)) assert_allclose(out, x) - assert type(out) == type(x) + assert type(out) is type(x) @image_comparison(['logit_scales.png'], remove_text=True)