MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Allow to use global variables HTTP_PROXY and HTTPS_PROXY again 

Fix #365
pull/366/head
Raphaël Vinot 2019-03-11 11:56:45 +01:00
parent c458a3df51
commit ea6aeff4e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pymisp/api.py
View File

@ -180,10 +180,11 @@ class PyMISP(object):
'User-Agent': 'PyMISP {} - Python {}.{}.{}'.format(__version__, *sys.version_info)}) 'User-Agent': 'PyMISP {} - Python {}.{}.{}'.format(__version__, *sys.version_info)})
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logger.debug(prepped.headers) logger.debug(prepped.headers)
settings = s.merge_environment_settings(req.url, proxies=self.proxies, stream=None, verify=self.ssl, cert=self.cert)
if self.asynch and background_callback is not None: if self.asynch and background_callback is not None:
return s.send(prepped, verify=self.ssl, proxies=self.proxies, cert=self.cert, background_callback=background_callback) return s.send(prepped, background_callback=background_callback, **settings)
else: else:
return s.send(prepped, verify=self.ssl, proxies=self.proxies, cert=self.cert) return s.send(prepped, **settings)
# ##################### # #####################
# ### Core helpers #### # ### Core helpers ####