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

Merge pull request #607 from paalbra/remove-unnecessary-logic 

Remove explicit loglevel checking
pull/608/head
Raphaël Vinot 2020-07-28 12:42:44 +02:00 committed by GitHub
parent 82aa3c815d e8d34ea337
commit 706e553f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pymisp/api.py
View File

@ -2307,15 +2307,13 @@ class PyMISP:
try:
response_json = response.json()
if logger.isEnabledFor(logging.DEBUG):
logger.debug(response_json)
logger.debug(response_json)
if isinstance(response_json, dict) and response_json.get('response') is not None:
# Cleanup.
response_json = response_json['response']
return response_json
except Exception:
if logger.isEnabledFor(logging.DEBUG):
logger.debug(response.text)
logger.debug(response.text)
if expect_json:
raise PyMISPUnexpectedResponse(f'Unexpected response from server: {response.text}')
if lenient_response_type and not response.headers['Accept'].startswith('application/json'):
@ -2342,10 +2340,9 @@ class PyMISP:
data = {k: v for k, v in data.items() if v is not None}
d = json.dumps(data, default=pymisp_json_default)
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f'{request_type} - {url}')
if d is not None:
logger.debug(d)
logger.debug(f'{request_type} - {url}')
if d is not None:
logger.debug(d)
if kw_params:
# CakePHP params in URL
@ -2363,8 +2360,7 @@ class PyMISP:
'Accept': f'application/{output_type}',
'content-type': 'application/json',
'User-Agent': user_agent})
if logger.isEnabledFor(logging.DEBUG):
logger.debug(prepped.headers)
logger.debug(prepped.headers)
settings = s.merge_environment_settings(req.url, proxies=self.proxies or {}, stream=None, verify=self.ssl, cert=self.cert)
return s.send(prepped, timeout=self.timeout, **settings)