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

Merge pull request #366 from jaccol/patch-1 

fix for "'NoneType' object has no attribute 'setdefault'"
pull/370/head
Raphaël Vinot 2019-03-11 13:38:44 +01:00 committed by GitHub
parent ea6aeff4e1 00bce80bdb
commit 2c8ab0aa1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/api.py
View File

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