diff --git a/examples/get.py b/examples/get.py index 5da2d4e..71bfa97 100755 --- a/examples/get.py +++ b/examples/get.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- from pymisp import PyMISP -from keys import misp_url, misp_key,misp_verifycert +from keys import misp_url, misp_key, misp_verifycert import argparse import os import json @@ -10,9 +10,16 @@ import json # Usage for pipe masters: ./last.py -l 5h | jq . +proxies = { + 'http': 'http://127.0.0.1:8123', + 'https': 'http://127.0.0.1:8123', +} + +proxies = None + def init(url, key): - return PyMISP(url, key, misp_verifycert, 'json') + return PyMISP(url, key, misp_verifycert, 'json', proxies=proxies) def get_event(m, event, out=None): @@ -24,8 +31,8 @@ def get_event(m, event, out=None): with open(out, 'w') as f: f.write(json.dumps(r) + '\n') - if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Get an event from a MISP instance.') parser.add_argument("-e", "--event", required=True, help="Event ID to get.") parser.add_argument("-o", "--output", help="Output file") diff --git a/examples/situational-awareness/tools.py b/examples/situational-awareness/tools.py index 8b3a8b7..6cff510 100644 --- a/examples/situational-awareness/tools.py +++ b/examples/situational-awareness/tools.py @@ -212,7 +212,7 @@ def createTreemap(data, title, treename='attribute_treemap.svg', tablename='attr transition='400ms ease-in', colors=tuple(colors.values())) - treemap = pygal.Treemap(pretty_print=True, legend_at_bottom=True, style=style) + treemap = pygal.Treemap(pretty_print=True, legend_at_bottom=True, style=style, explicit_size=True, width=2048, height=2048) treemap.title = title treemap.print_values = True treemap.print_labels = True diff --git a/pymisp/__init__.py b/pymisp/__init__.py index c6a29ba..aea8a6c 100644 --- a/pymisp/__init__.py +++ b/pymisp/__init__.py @@ -1,3 +1,3 @@ -__version__ = '2.4.48.2' +__version__ = '2.4.49' from .api import PyMISP, PyMISPError, NewEventError, NewAttributeError, MissingDependency, NoURL, NoKey diff --git a/setup.py b/setup.py index 0e8f3e9..5cab2ca 100644 --- a/setup.py +++ b/setup.py @@ -17,9 +17,12 @@ setup( 'License :: OSI Approved :: BSD License', 'Development Status :: 5 - Production/Stable', 'Environment :: Console', + 'Operating System :: POSIX :: Linux', 'Intended Audience :: Science/Research', 'Intended Audience :: Telecommunications Industry', - 'Programming Language :: Python', + 'Intended Audience :: Information Technology', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', 'Topic :: Security', 'Topic :: Internet', ],