Skip to content

Commit

Permalink
Merge branch 'master' of github.com:CIRCL/PyMISP
Browse files Browse the repository at this point in the history
  • Loading branch information
adulau committed Jun 20, 2017
2 parents 4f66996 + 5130591 commit 4a21727
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pymisp/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ def __query(self, session, path, query, controller='events', async_callback=None
if controller not in ['events', 'attributes']:
raise Exception('Invalid controller. Can only be {}'.format(', '.join(['events', 'attributes'])))
url = urljoin(self.root_url, '{}/{}'.format(controller, path.lstrip('/')))
logger.debug('URL: ', url)
logger.debug('Query: ', query)
logger.debug('URL: %s', url)
logger.debug('Query: %s', query)

if ASYNC_OK and isinstance(session, FuturesSession) and async_callback:
response = session.post(url, data=json.dumps(query), background_callback=async_callback)
Expand Down Expand Up @@ -1484,7 +1484,7 @@ def get_stix_event(self, event_id=None, with_attachments=False, from_date=False,
session = self.__prepare_session()
url = urljoin(self.root_url, "/events/stix/download/{}/{}/{}/{}/{}".format(
event_id, with_attachments, tags, from_date, to_date))
logger.debug("Getting STIX event from", url)
logger.debug("Getting STIX event from %s", url)
response = session.get(url)
return self._check_response(response)

Expand Down

0 comments on commit 4a21727

Please sign in to comment.