Mar 12, 2016 · Mar 12, 2016
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
        except TypeError:
            if cbook.iterable(val) and len(val):
                try:
                    float(val[0])
                    float(cbook.safe_first_element(val))
                except (TypeError, ValueError):
                    pass  # raise below
                else:
        if not cbook.iterable(val):
            val = (val,)
        try:
            bool(val[0])
            bool(cbook.safe_first_element(val))
        except (TypeError, IndexError):
            raise TypeError('val must be a bool or nonzero sequence of them')
        return val
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
 from nose.tools import assert_equal
 import numpy as np
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from nose.plugins.skip import SkipTest

 import matplotlib.pyplot as plt
 import matplotlib.collections as mcollections
 import matplotlib.transforms as mtransforms
 from matplotlib.collections import EventCollection
 from matplotlib.collections importCollection,EventCollection
 from matplotlib.testing.decorators import cleanup, image_comparison


    ax.set_ylim(0, 30)


 def test_pandas_indexing():
    try:
        import pandas as pd
    except ImportError:
        raise SkipTest("Pandas not installed")

    # Should not fail break when faced with a
    # non-zero indexed series
    index = [11, 12, 13]
    ec = fc = pd.Series(['red', 'blue', 'green'], index=index)
    lw = pd.Series([1, 2, 3], index=index)
    aa = pd.Series([True, False, True], index=index)

    Collection(edgecolors=ec)
    Collection(facecolors=fc)
    Collection(linewidths=lw)
    Collection(antialiaseds=aa)


 if __name__ == '__main__':
    import nose
    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -151,7 +151,7 @@ def _get_value(val):
		except TypeError:
		if cbook.iterable(val) and len(val):
		try:
		float(val[0])
		float(cbook.safe_first_element(val))
		except (TypeError, ValueError):
		pass # raise below
		else:
Expand All		@@ -164,7 +164,7 @@ def _get_bool(val):
		if not cbook.iterable(val):
		val = (val,)
		try:
		bool(val[0])
		bool(cbook.safe_first_element(val))
		except (TypeError, IndexError):
		raise TypeError('val must be a bool or nonzero sequence of them')
		return val
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,11 +11,12 @@
		from nose.tools import assert_equal
		import numpy as np
		from numpy.testing import assert_array_equal, assert_array_almost_equal
		from nose.plugins.skip import SkipTest

		import matplotlib.pyplot as plt
		import matplotlib.collections as mcollections
		import matplotlib.transforms as mtransforms
		from matplotlib.collections import EventCollection
		from matplotlib.collections importCollection,EventCollection
		from matplotlib.testing.decorators import cleanup, image_comparison


Expand DownExpand Up		@@ -617,6 +618,25 @@ def test_size_in_xy():
		ax.set_ylim(0, 30)


		def test_pandas_indexing():
		try:
		import pandas as pd
		except ImportError:
		raise SkipTest("Pandas not installed")

		# Should not fail break when faced with a
		# non-zero indexed series
		index = [11, 12, 13]
		ec = fc = pd.Series(['red', 'blue', 'green'], index=index)
		lw = pd.Series([1, 2, 3], index=index)
		aa = pd.Series([True, False, True], index=index)

		Collection(edgecolors=ec)
		Collection(facecolors=fc)
		Collection(linewidths=lw)
		Collection(antialiaseds=aa)


		if __name__ == '__main__':
		import nose
		nose.runmodule(argv=['-s', '--with-doctest'], exit=False)