Commit363108e

authored

Merge pull request#18670 from tacaswell/optional_cerifi

MNT: make certifi actually optional

2 parentse5a6008 +1883380 commit363108eCopy full SHA for 363108e

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
`@@ -717,7 +717,11 @@ def is_url(filename):`
`717`	`717`
`718`	`718`	`@functools.lru_cache()`
`719`	`719`	`def_get_ssl_context():`
`720`		`-importcertifi`
	`720`	`+try:`
	`721`	`+importcertifi`
	`722`	`+exceptImportError:`
	`723`	`+_log.debug("Could not import certifi.")`
	`724`	`+returnNone`
`721`	`725`	`importssl`
`722`	`726`	`returnssl.create_default_context(cafile=certifi.where())`
`723`	`727`
`@@ -726,7 +730,12 @@ def _get_ssl_context():`
`726`	`730`	`def_open_file_or_url(fname):`
`727`	`731`	`ifnotisinstance(fname,Path)andis_url(fname):`
`728`	`732`	`importurllib.request`
`729`		`-withurllib.request.urlopen(fname,context=_get_ssl_context())asf:`
	`733`	`+ssl_ctx=_get_ssl_context()`
	`734`	`+ifssl_ctxisNone:`
	`735`	`+_log.debug(`
	`736`	`+"Could not get certifi ssl context, https may not work."`
	`737`	`+ )`
	`738`	`+withurllib.request.urlopen(fname,context=ssl_ctx)asf:`
`730`	`739`	`yield (line.decode('utf-8')forlineinf)`
`731`	`740`	`else:`
`732`	`741`	`fname=os.path.expanduser(fname)`

Lines changed: 6 additions & 2 deletions

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

Comments

(0)