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

Merge pull request #77 from PaulSec/master 

Fixed the JSON output format (\n breaks JSON loading afterwards)
pull/80/head
Raphaël Vinot 2017-05-02 17:05:00 +02:00 committed by GitHub
parent e86ffab5f4 36cf46acd9
commit 96e28533e0
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/last.py
View File

@ -19,8 +19,7 @@ def download_last(m, last, out=None):
result = m.download_last(last) result = m.download_last(last)
if out is None: if out is None:
if 'response' in result: if 'response' in result:
for e in result['response']: print(json.dumps(result['response']))
print(json.dumps(e) + '\n')
else: else:
print('No results for that time period') print('No results for that time period')
exit(0) exit(0)

6
examples/search.py
View File

@ -18,12 +18,10 @@ def search(m, quiet, url, controller, out=None, **kwargs):
for e in result['response']: for e in result['response']:
print('{}{}{}\n'.format(url, '/events/view/', e['Event']['id'])) print('{}{}{}\n'.format(url, '/events/view/', e['Event']['id']))
elif out is None: elif out is None:
for e in result['response']: print(json.dumps(result['response']))
print(json.dumps(e) + '\n')
else: else:
with open(out, 'w') as f: with open(out, 'w') as f:
for e in result['response']: f.write(json.dumps(result['response']))
f.write(json.dumps(e) + '\n')
if __name__ == '__main__': if __name__ == '__main__':

6
examples/searchall.py
View File

@ -18,12 +18,10 @@ def searchall(m, search, quiet, url, out=None):
for e in result['response']: for e in result['response']:
print('{}{}{}\n'.format(url, '/events/view/', e['Event']['id'])) print('{}{}{}\n'.format(url, '/events/view/', e['Event']['id']))
elif out is None: elif out is None:
for e in result['response']: print(json.dumps(result['response']))
print(json.dumps(e) + '\n')
else: else:
with open(out, 'w') as f: with open(out, 'w') as f:
for e in result['response']: f.write(json.dumps(result['response']))
f.write(json.dumps(e) + '\n')
if __name__ == '__main__': if __name__ == '__main__':