Commitd941d33

authored

Merge pull request#18676 from meeseeksmachine/auto-backport-of-pr-18670-on-v3.3.x

Backport PR#18670 on branch v3.3.x (MNT: make certifi actually optional)

2 parents58e9740 +64f1e53 commitd941d33Copy full SHA for d941d33

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,11 @@ def is_url(filename):`
`762`	`762`
`763`	`763`	`@functools.lru_cache()`
`764`	`764`	`def_get_ssl_context():`
`765`		`-importcertifi`
	`765`	`+try:`
	`766`	`+importcertifi`
	`767`	`+exceptImportError:`
	`768`	`+_log.debug("Could not import certifi.")`
	`769`	`+returnNone`
`766`	`770`	`importssl`
`767`	`771`	`returnssl.create_default_context(cafile=certifi.where())`
`768`	`772`
`@@ -771,7 +775,12 @@ def _get_ssl_context():`
`771`	`775`	`def_open_file_or_url(fname):`
`772`	`776`	`ifnotisinstance(fname,Path)andis_url(fname):`
`773`	`777`	`importurllib.request`
`774`		`-withurllib.request.urlopen(fname,context=_get_ssl_context())asf:`
	`778`	`+ssl_ctx=_get_ssl_context()`
	`779`	`+ifssl_ctxisNone:`
	`780`	`+_log.debug(`
	`781`	`+"Could not get certifi ssl context, https may not work."`
	`782`	`+ )`
	`783`	`+withurllib.request.urlopen(fname,context=ssl_ctx)asf:`
`775`	`784`	`yield (line.decode('utf-8')forlineinf)`
`776`	`785`	`else:`
`777`	`786`	`fname=os.path.expanduser(fname)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1481,8 +1481,12 @@ def imread(fname, format=None):`
`1481`	`1481`	`iflen(parsed.scheme)>1:# Pillow doesn't handle URLs directly.`
`1482`	`1482`	`# hide imports to speed initial import on systems with slow linkers`
`1483`	`1483`	`fromurllibimportrequest`
`1484`		`-withrequest.urlopen(fname,`
`1485`		`-context=mpl._get_ssl_context())asresponse:`
	`1484`	`+ssl_ctx=mpl._get_ssl_context()`
	`1485`	`+ifssl_ctxisNone:`
	`1486`	`+_log.debug(`
	`1487`	`+"Could not get certifi ssl context, https may not work."`
	`1488`	`+ )`
	`1489`	`+withrequest.urlopen(fname,context=ssl_ctx)asresponse:`
`1486`	`1490`	`importio`
`1487`	`1491`	`try:`
`1488`	`1492`	`response.seek(0)`

Comments

(0)