Merge pull request #10570 from anntzer/fixtest

jklymak · web-flow · commit ef1514066746 · 2018-02-25T10:02:17.000-08:00
Fix check_shared in test_subplots.
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
@@ -1,5 +1,4 @@
-from __future__ import absolute_import, division, print_function
-
+import itertools
 import warnings
 
 import numpy
@@ -14,14 +13,15 @@ def check_shared(axs, x_shared, y_shared):
     x_shared and y_shared are n x n boolean matrices; entry (i, j) indicates
     whether the x (or y) axes of subplots i and j should be shared.
     """
-    shared = [axs[0]._shared_x_axes, axs[0]._shared_y_axes]
-    for (i1, ax1), (i2, ax2), (i3, (name, shared)) in zip(
+    for (i1, ax1), (i2, ax2), (i3, (name, shared)) in itertools.product(
             enumerate(axs),
             enumerate(axs),
             enumerate(zip("xy", [x_shared, y_shared]))):
         if i2 <= i1:
             continue
-        assert shared[i3].joined(ax1, ax2) == shared[i1, i2], \
+        assert \
+            (getattr(axs[0], "_shared_{}_axes".format(name)).joined(ax1, ax2)
+             == shared[i1, i2]), \
             "axes %i and %i incorrectly %ssharing %s axis" % (
                 i1, i2, "not " if shared[i1, i2] else "", name)
 
@@ -30,7 +30,7 @@ def check_visible(axs, x_visible, y_visible):
     def tostr(v):
         return "invisible" if v else "visible"
 
-    for (ax, vx, vy) in zip(axs, x_visible, y_visible):
+    for ax, vx, vy in zip(axs, x_visible, y_visible):
         for l in ax.get_xticklabels() + [ax.get_xaxis().offsetText]:
             assert l.get_visible() == vx, \
                     "X axis was incorrectly %s" % (tostr(vx))
