FIX: broadcasting bug in collection ls/lw

tacaswell · tacaswell · commit aeda340647cf · 2016-07-11T16:40:57.000-05:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -124,6 +124,7 @@ def __init__(self,
         cm.ScalarMappable.__init__(self, norm, cmap)
         self._us_linestyles = [(None, None)]
         self._linestyles = [(None, None)]
+        self._us_lw = [0]
         self._linewidths = [0]
         self.set_edgecolor(edgecolors)
         self.set_facecolor(facecolors)
@@ -496,10 +497,10 @@ def set_linewidth(self, lw):
                     lw = mpl.rcParams['lines.linewidth']
             else:
                 lw = 0
-        lw = self._get_value(lw)
+        self._us_lw = self._get_value(lw)
 
         self._linewidths, self._linestyles = self._bcast_lwls(
-            self._get_value(lw), self._us_linestyles)
+            self._us_lw, self._us_linestyles)
         self.stale = True
 
     def set_linewidths(self, lw):
@@ -555,8 +556,9 @@ def set_linestyle(self, ls):
                 'Do not know how to convert {!r} to dashes'.format(ls))
 
         self._us_linestyles = dashes
+        self._linewidths
         self._linewidths, self._linestyles = self._bcast_lwls(
-            self._linewidths, self._us_linestyles)
+            self._us_lw, self._us_linestyles)
 
     @staticmethod
     def _bcast_lwls(linewidths, dashes):
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -640,6 +640,20 @@ def test_pandas_indexing():
     Collection(antialiaseds=aa)
 
 
+@cleanup(style='default')
+def test_lslw_bcast():
+    col = mcollections.PathCollection([])
+    col.set_linestyles(['-', '-'])
+    col.set_linewidths([1, 2, 3])
+
+    assert col.get_linestyles() == [(None, None)] * 6
+    assert col.get_linewidths() == [1, 2, 3] * 2
+
+    col.set_linestyles(['-', '-', '-'])
+    assert col.get_linestyles() == [(None, None)] * 3
+    assert col.get_linewidths() == [1, 2, 3]
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
