Commit3418f46

committed

Fix: Pandas indexing Error in collections

Specifically, when creating collection objects,`linewidths` and `antialiaseds` can be non zero indexedpandas series.Related to: PR#5556

1 parent7f21cc5 commit3418f46Copy full SHA for 3418f46

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ def _get_value(val):`
`151`	`151`	`exceptTypeError:`
`152`	`152`	`ifcbook.iterable(val)andlen(val):`
`153`	`153`	`try:`
`154`		`-float(val[0])`
	`154`	`+float(cbook.safe_first_element(val))`
`155`	`155`	`except (TypeError,ValueError):`
`156`	`156`	`pass# raise below`
`157`	`157`	`else:`
`@@ -164,7 +164,7 @@ def _get_bool(val):`
`164`	`164`	`ifnotcbook.iterable(val):`
`165`	`165`	`val= (val,)`
`166`	`166`	`try:`
`167`		`-bool(val[0])`
	`167`	`+bool(cbook.safe_first_element(val))`
`168`	`168`	`except (TypeError,IndexError):`
`169`	`169`	`raiseTypeError('val must be a bool or nonzero sequence of them')`
`170`	`170`	`returnval`

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`	`fromnose.toolsimportassert_equal`
`12`	`12`	`importnumpyasnp`
`13`	`13`	`fromnumpy.testingimportassert_array_equal,assert_array_almost_equal`
	`14`	`+fromnose.plugins.skipimportSkipTest`
`14`	`15`
`15`	`16`	`importmatplotlib.pyplotasplt`
`16`	`17`	`importmatplotlib.collectionsasmcollections`
`17`	`18`	`importmatplotlib.transformsasmtransforms`
`18`		`-frommatplotlib.collectionsimportEventCollection`
	`19`	`+frommatplotlib.collectionsimportCollection,EventCollection`
`19`	`20`	`frommatplotlib.testing.decoratorsimportcleanup,image_comparison`
`20`	`21`
`21`	`22`
`@@ -617,6 +618,25 @@ def test_size_in_xy():`
`617`	`618`	`ax.set_ylim(0,30)`
`618`	`619`
`619`	`620`
	`621`	`+deftest_pandas_indexing():`
	`622`	`+try:`
	`623`	`+importpandasaspd`
	`624`	`+exceptImportError:`
	`625`	`+raiseSkipTest("Pandas not installed")`
	`626`	`+`
	`627`	`+# Should not fail break when faced with a`
	`628`	`+# non-zero indexed series`
	`629`	`+index= [11,12,13]`
	`630`	`+ec=fc=pd.Series(['red','blue','green'],index=index)`
	`631`	`+lw=pd.Series([1,2,3],index=index)`
	`632`	`+aa=pd.Series([True,False,True],index=index)`
	`633`	`+`
	`634`	`+Collection(edgecolors=ec)`
	`635`	`+Collection(facecolors=fc)`
	`636`	`+Collection(linewidths=lw)`
	`637`	`+Collection(antialiaseds=aa)`
	`638`	`+`
	`639`	`+`
`620`	`640`	`if__name__=='__main__':`
`621`	`641`	`importnose`
`622`	`642`	`nose.runmodule(argv=['-s','--with-doctest'],exit=False)`

Comments

(0)