From 31b1b932e5da26535b63f8c943ba4e5c5dc2332f Mon Sep 17 00:00:00 2001 From: c-goes Date: Fri, 6 Oct 2017 13:08:28 +0200 Subject: [PATCH 1/3] added default_category for email-message-id --- pymisp/data/describeTypes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymisp/data/describeTypes.json b/pymisp/data/describeTypes.json index 6435855..bff6ac3 100644 --- a/pymisp/data/describeTypes.json +++ b/pymisp/data/describeTypes.json @@ -438,7 +438,7 @@ "to_ids": 0 }, "email-message-id": { - "default_category": "", + "default_category": "Payload delivery", "to_ids": 0 }, "github-username": { From 89a55580146c0721b734f77ab2669ffe05fa20b9 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Sun, 19 Nov 2017 10:02:03 +0100 Subject: [PATCH 2/3] - Remove CIRCL reference from README.md - Updated 2 bad indentations where epydoc was Warning --- README.md | 4 ++-- pymisp/api.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bf44f06..261534f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ pip3 install pymisp ## Install the latest version from repo ``` -git clone https://github.com/CIRCL/PyMISP.git && cd PyMISP +git clone https://github.com/MISP/PyMISP.git && cd PyMISP pip3 install -I . ``` @@ -84,7 +84,7 @@ logging.basicConfig(level=logging.DEBUG, filename="debug.log", filemode='w', for Documentation can be generated with epydoc: ``` -epydoc --url https://github.com/CIRCL/PyMISP --graph all --name PyMISP --pdf pymisp -o doc +epydoc --url https://github.com/MISP/PyMISP --graph all --name PyMISP --pdf pymisp -o doc ``` ## Everything is a Mutable Mapping diff --git a/pymisp/api.py b/pymisp/api.py index 4bbbf51..e92f1de 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -68,9 +68,9 @@ class PyMISP(object): :param url: URL of the MISP instance you want to connect to :param key: API key of the user you want to use :param ssl: can be True or False (to check ot not the validity - of the certificate. Or a CA_BUNDLE in case of self - signed certiifcate (the concatenation of all the - *.crt of the chain) + of the certificate. Or a CA_BUNDLE in case of self + signed certiifcate (the concatenation of all the + *.crt of the chain) :param out_type: Type of object (json) NOTE: XML output isn't supported anymore, keeping the flag for compatibility reasons. :param debug: Write all the debug information to stderr :param proxies: Proxy dict as describes here: http://docs.python-requests.org/en/master/user/advanced/#proxies @@ -902,8 +902,8 @@ class PyMISP(object): analysis=None, attribute=None, org=None, async_callback=None, normalize=False): """Search only at the index level. Use ! infront of value as NOT, default OR If using async, give a callback that takes 2 args, session and response: - basic usage is - pymisp.search_index(..., async_callback=lambda ses,resp: print(resp.json())) + basic usage is + pymisp.search_index(..., async_callback=lambda ses,resp: print(resp.json())) :param published: Published (0,1) :param eventid: Evend ID(s) | str or list From 2e5fcf4e31e4f2bcfc20beba0edbd67f63d7a1bb Mon Sep 17 00:00:00 2001 From: c-goes Date: Mon, 20 Nov 2017 15:11:30 +0100 Subject: [PATCH 3/3] fixed typo --- pymisp/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymisp/api.py b/pymisp/api.py index e92f1de..0956cd0 100644 --- a/pymisp/api.py +++ b/pymisp/api.py @@ -403,7 +403,7 @@ class PyMISP(object): :param alert: set to True by default (send alerting email) if False will not send alert :return publish status """ - if isinstance(event, int) or (isinstance(event, basestring) and event.is_digit()): + if isinstance(event, int) or (isinstance(event, basestring) and event.isdigit()): full_event = self._make_mispevent(self.get_event(event)) else: full_event = self._make_mispevent(event)