From 72382f7618963f4413aaf9deb71557ce09e4d981 Mon Sep 17 00:00:00 2001 From: aparriel Date: Wed, 31 May 2017 18:07:31 +0200 Subject: [PATCH 1/2] Fix missing %s in debug Missing %s in logger.debug call lead to error. --- pymisp/api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pymisp/api.py b/pymisp/api.py index d49cf4d..142bcba 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -774,8 +774,8 @@ class PyMISP(object): 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) @@ -1468,7 +1468,7 @@ class PyMISP(object): 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) From 26c12ea8f0bf025092946d26c14b0045f813bec1 Mon Sep 17 00:00:00 2001 From: Alexander J Date: Mon, 19 Jun 2017 16:08:14 +0200 Subject: [PATCH 2/2] use misp_verifycert from keys.py --- examples/del.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/del.py b/examples/del.py index 0577353..24969d1 100755 --- a/examples/del.py +++ b/examples/del.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- from pymisp import PyMISP -from keys import misp_url, misp_key +from keys import misp_url, misp_key,misp_verifycert import argparse @@ -10,7 +10,7 @@ import argparse def init(url, key): - return PyMISP(url, key, True, 'json', debug=True) + return PyMISP(url, key, misp_verifycert, 'json', debug=True) def del_event(m, eventid):