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

fix: Remove duplicate check if debug logging is enabled

pull/643/head
Jakub Onderka 2020-10-25 17:15:21 +01:00
parent 2fb61d4b32
commit 6050ff16d4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pymisp/api.py
View File

@ -2309,15 +2309,13 @@ class PyMISP:
try: try:
response_json = response.json() 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: if isinstance(response_json, dict) and response_json.get('response') is not None:
# Cleanup. # Cleanup.
response_json = response_json['response'] response_json = response_json['response']
return response_json return response_json
except Exception: except Exception:
if logger.isEnabledFor(logging.DEBUG): logger.debug(response.text)
logger.debug(response.text)
if expect_json: if expect_json:
raise PyMISPUnexpectedResponse(f'Unexpected response from server: {response.text}') raise PyMISPUnexpectedResponse(f'Unexpected response from server: {response.text}')
if lenient_response_type and not response.headers['Accept'].startswith('application/json'): if lenient_response_type and not response.headers['Accept'].startswith('application/json'):
@ -2365,8 +2363,7 @@ class PyMISP:
'Accept': f'application/{output_type}', 'Accept': f'application/{output_type}',
'content-type': 'application/json', 'content-type': 'application/json',
'User-Agent': user_agent}) '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) 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) return s.send(prepped, timeout=self.timeout, **settings)