Commit5059e7e

committed

Warn via logging, add test

1 parent1290594 commit5059e7eCopy full SHA for 5059e7e

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`frommathimportceil`
`15`	`15`	`importos`
`16`		`-importwarnings`
	`16`	`+importlogging`
`17`	`17`
`18`	`18`	`importnumpyasnp`
`19`	`19`
`@@ -35,6 +35,8 @@`
`35`	`35`	`frommatplotlib.transformsimport (Affine2D,BboxBase,Bbox,BboxTransform,`
`36`	`36`	`IdentityTransform,TransformedBbox)`
`37`	`37`
	`38`	`+_log=logging.getLogger(__name__)`
	`39`	`+`
`38`	`40`	`# map interpolation strings to module constants`
`39`	`41`	`_interpd_= {`
`40`	`42`	`'none':_image.NEAREST,# fall back to nearest when not supported`
`@@ -618,7 +620,7 @@ def set_data(self, A):`
`618`	`620`	`# making reliable interpretation impossible.`
`619`	`621`	`high=255ifnp.issubdtype(self._A.dtype,np.integer)else1`
`620`	`622`	`ifself._A.min()<0orhigh<self._A.max():`
`621`		`-warnings.warn(`
	`623`	`+_log.warn(`
`622`	`624`	`'Clipping input data to the valid range for imshow with '`
`623`	`625`	`'RGB data ([0..1] for floats or [0..255] for integers).'`
`624`	`626`	`)`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ def test_minimized_rasterized():`
`602`	`602`	`deftest_load_from_url():`
`603`	`603`	`req=six.moves.urllib.request.urlopen(`
`604`	`604`	`"http://matplotlib.org/_static/logo_sidebar_horiz.png")`
`605`		`-Z=plt.imread(req)`
	`605`	`+plt.imread(req)`
`606`	`606`
`607`	`607`
`608`	`608`	`@image_comparison(baseline_images=['log_scale_image'],`
`@@ -795,6 +795,17 @@ def test_imshow_no_warn_invalid():`
`795`	`795`	`assertlen(warns)==0`
`796`	`796`
`797`	`797`
	`798`	`+@pytest.mark.parametrize('as_float', [True,False])`
	`799`	`+deftest_imshow_logs_when_clipping_invalid_rgb(as_float,caplog):`
	`800`	`+arr=np.arange(300).reshape((10,10,3))`
	`801`	`+ifas_float:`
	`802`	`+arr=arr/255`
	`803`	`+fig=plt.figure()`
	`804`	`+ax=fig.add_subplot(111)`
	`805`	`+ax.imshow(arr)`
	`806`	`+assert'Clipping input data to the valid range for imshow'incaplog.text`
	`807`	`+`
	`808`	`+`
`798`	`809`	`@image_comparison(baseline_images=['imshow_flatfield'],`
`799`	`810`	`remove_text=True,style='mpl20',`
`800`	`811`	`extensions=['png'])`

Comments

(0)