Commit5b132aa

committed

Deprecate imread() reading from URLs

1 parent825f518 commit5b132aaCopy full SHA for 5b132aa

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	+``imread()`` reading from URLs
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+`
	`4`	+Passing a URL to `~.pyplot.imread()` is deprecated. Please open the URL before
	`5`	+reading using ``urllib.request.urlopen()``.

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,9 @@ def imread(fname, format=None):`
`1431`	`1431`	`fname : str or file-like`
`1432`	`1432`	`The image file to read: a filename, a URL or a file-like object opened`
`1433`	`1433`	`in read-binary mode.`
	`1434`	`+`
	`1435`	`+ Passing a URL is deprecated. Please open the URL before reading using`
	`1436`	+ ``urllib.request.urlopen()``.
`1434`	`1437`	`format : str, optional`
`1435`	`1438`	`The image file format assumed for reading the data. If not`
`1436`	`1439`	`given, the format is deduced from the filename. If nothing can`
`@@ -1473,9 +1476,12 @@ def imread(fname, format=None):`
`1473`	`1476`	`img_open= (`
`1474`	`1477`	`PIL.PngImagePlugin.PngImageFileifext=='png'elsePIL.Image.open)`
`1475`	`1478`	`ifisinstance(fname,str):`
`1476`		`-`
`1477`	`1479`	`parsed=parse.urlparse(fname)`
`1478`	`1480`	`iflen(parsed.scheme)>1:# Pillow doesn't handle URLs directly.`
	`1481`	`+cbook.warn_deprecated(`
	`1482`	`+"3.4",message="Directly reading images from URLs is "`
	`1483`	`+"deprecated. Please open the URL before "`
	`1484`	`+"reading using urllib.request.urlopen().")`
`1479`	`1485`	`# hide imports to speed initial import on systems with slow linkers`
`1480`	`1486`	`fromurllibimportrequest`
`1481`	`1487`	`withrequest.urlopen(fname,`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`fromPILimportImage`
`13`	`13`
`14`	`14`	`frommatplotlibimport (`
`15`		`-colors,imageasmimage,patches,pyplotasplt,style,rcParams)`
	`15`	`+cbook,colors,imageasmimage,patches,pyplotasplt,style,rcParams)`
`16`	`16`	`frommatplotlib.imageimport (AxesImage,BboxImage,FigureImage,`
`17`	`17`	`NonUniformImage,PcolorImage)`
`18`	`18`	`frommatplotlib.testing.decoratorsimportcheck_figures_equal,image_comparison`
`@@ -705,7 +705,8 @@ def test_load_from_url():`
`705`	`705`	`url= ('file:'`
`706`	`706`	`+ ('///'ifsys.platform=='win32'else'')`
`707`	`707`	`+path.resolve().as_posix())`
`708`		`-plt.imread(url)`
	`708`	`+withcbook._suppress_matplotlib_deprecation_warning():`
	`709`	`+plt.imread(url)`
`709`	`710`	`plt.imread(urllib.request.urlopen(url))`
`710`	`711`
`711`	`712`
`@@ -1124,7 +1125,8 @@ def test_exact_vmin():`
`1124`	`1125`	`@pytest.mark.network`
`1125`	`1126`	`@pytest.mark.flaky`
`1126`	`1127`	`deftest_https_imread_smoketest():`
`1127`		`-v=mimage.imread('https://matplotlib.org/1.5.0/_static/logo2.png')`
	`1128`	`+withcbook._suppress_matplotlib_deprecation_warning():`
	`1129`	`+v=mimage.imread('https://matplotlib.org/1.5.0/_static/logo2.png')`
`1128`	`1130`
`1129`	`1131`
`1130`	`1132`	`# A basic ndarray subclass that implements a quantity`

Comments

(0)