Commitdbe3622

authored

Merge pull request#19367 from anntzer/deprecate-imread-url

Deprecate imread() reading from URLs

2 parents476b7e4 +9302392 commitdbe3622Copy full SHA for dbe3622

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	+``imread()`` reading from URLs
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+`
	`4`	+Passing a URL to `~.pyplot.imread()` is deprecated. Please open the URL for
	`5`	`+reading and directly use the Pillow API`
	`6`	+(``PIL.Image.open(urllib.request.urlopen(url))``, or
	`7`	+``PIL.Image.open(io.BytesIO(requests.get(url).content))``) instead.

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1430,6 +1430,10 @@ def imread(fname, format=None):`
`1430`	`1430`	`fname : str or file-like`
`1431`	`1431`	`The image file to read: a filename, a URL or a file-like object opened`
`1432`	`1432`	`in read-binary mode.`
	`1433`	`+`
	`1434`	`+ Passing a URL is deprecated. Please open the URL`
	`1435`	`+ for reading and pass the result to Pillow, e.g. with`
	`1436`	+ ``PIL.Image.open(urllib.request.urlopen(url))``.
`1433`	`1437`	`format : str, optional`
`1434`	`1438`	`The image file format assumed for reading the data. If not`
`1435`	`1439`	`given, the format is deduced from the filename. If nothing can`
`@@ -1472,9 +1476,13 @@ def imread(fname, format=None):`
`1472`	`1476`	`img_open= (`
`1473`	`1477`	`PIL.PngImagePlugin.PngImageFileifext=='png'elsePIL.Image.open)`
`1474`	`1478`	`ifisinstance(fname,str):`
`1475`		`-`
`1476`	`1479`	`parsed=parse.urlparse(fname)`
`1477`	`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 for reading and pass the "`
	`1484`	`+"result to Pillow, e.g. with "`
	`1485`	+"``PIL.Image.open(urllib.request.urlopen(url))``.")
`1478`	`1486`	`# hide imports to speed initial import on systems with slow linkers`
`1479`	`1487`	`fromurllibimportrequest`
`1480`	`1488`	`ssl_ctx=mpl._get_ssl_context()`

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`	`+_api,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`
`@@ -714,7 +714,8 @@ def test_load_from_url():`
`714`	`714`	`url= ('file:'`
`715`	`715`	`+ ('///'ifsys.platform=='win32'else'')`
`716`	`716`	`+path.resolve().as_posix())`
`717`		`-plt.imread(url)`
	`717`	`+with_api.suppress_matplotlib_deprecation_warning():`
	`718`	`+plt.imread(url)`
`718`	`719`	`withurllib.request.urlopen(url)asfile:`
`719`	`720`	`plt.imread(file)`
`720`	`721`
`@@ -1128,7 +1129,8 @@ def test_exact_vmin():`
`1128`	`1129`	`@pytest.mark.network`
`1129`	`1130`	`@pytest.mark.flaky`
`1130`	`1131`	`deftest_https_imread_smoketest():`
`1131`		`-v=mimage.imread('https://matplotlib.org/1.5.0/_static/logo2.png')`
	`1132`	`+with_api.suppress_matplotlib_deprecation_warning():`
	`1133`	`+v=mimage.imread('https://matplotlib.org/1.5.0/_static/logo2.png')`
`1132`	`1134`
`1133`	`1135`
`1134`	`1136`	`# A basic ndarray subclass that implements a quantity`

Comments

(0)