Fix checking of 'labels' argument to Sankey.add.

anntzer · anntzer · commit 007dd8b73263 · 2019-01-18T11:16:23.000+01:00
Test by manually running the sankey examples.
diff --git a/lib/matplotlib/sankey.py b/lib/matplotlib/sankey.py
@@ -10,7 +10,7 @@
 from matplotlib.path import Path
 from matplotlib.patches import PathPatch
 from matplotlib.transforms import Affine2D
-from matplotlib import cbook, docstring
+from matplotlib import docstring
 from matplotlib import rcParams
 
 _log = logging.getLogger(__name__)
@@ -449,13 +449,13 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
             "orientations and flows must have the same length.\n"
             "orientations has length %d, but flows has length %d."
             % (len(orientations), n))
-        if not cbook.is_scalar_or_string(labels) and len(labels) != n:
+        try:
+            labels = np.broadcast_to(labels, n)
+        except ValueError:
             raise ValueError(
-                "If labels is a list, then labels and flows must have the "
-                "same length.\nlabels has length %d, but flows has length %d."
-                % (len(labels), n))
-        else:
-            labels = [labels] * n
+                f"The shapes of 'flows' {np.shape(flows)} and 'labels' "
+                f"{np.shape(labels)} are incompatible"
+            ) from None
         if trunklength < 0:
             raise ValueError(
             "trunklength is negative.\nThis isn't allowed, because it would "
