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

Merge branch 'master' of github.com:MISP/PyMISP

pull/49/head
Hannah Ward 2017-01-26 13:19:52 +00:00
parent d355fc7e44 9aa1c905a9
commit d260dc5ea5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/addtag.py
View File

@ -31,6 +31,6 @@ if __name__ == '__main__':
attribute = temp attribute = temp
break break
misp.add_tag(attribute, args.tag, True) misp.add_tag(attribute, args.tag, attribute=True)
else: else:
misp.add_tag(event['Event'], args.tag) misp.add_tag(event['Event'], args.tag)

4
pymisp/api.py
View File

@ -174,7 +174,7 @@ class PyMISP(object):
for e in errors: for e in errors:
if not e: if not e:
continue continue
if isinstance(e, str): if isinstance(e, basestring):
messages.append(e) messages.append(e)
continue continue
for type_e, msgs in e.items(): for type_e, msgs in e.items():
@ -467,7 +467,7 @@ class PyMISP(object):
# It's a file handle - we can read it # It's a file handle - we can read it
fileData = attachment.read() fileData = attachment.read()
elif isinstance(attachment, str): elif isinstance(attachment, basestring):
# It can either be the b64 encoded data or a file path # It can either be the b64 encoded data or a file path
if os.path.exists(attachment): if os.path.exists(attachment):
# It's a path! # It's a path!