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

fix: Bugs introduced by last commit

pull/531/head
Raphaël Vinot 2020-01-23 11:03:23 +01:00
parent 589d200b8f
commit 2ab47e191a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pymisp/mispevent.py
View File

@ -4,7 +4,7 @@ import datetime
import json import json
import os import os
import base64 import base64
from io import BytesIO from io import BytesIO, IOBase
from zipfile import ZipFile from zipfile import ZipFile
import uuid import uuid
from collections import defaultdict from collections import defaultdict
@ -152,7 +152,7 @@ class MISPAttribute(AbstractMISP):
self.Event: MISPEvent self.Event: MISPEvent
self.RelatedAttribute: List[MISPAttribute] self.RelatedAttribute: List[MISPAttribute]
def add_tag(self, tag: Optional[Union[str, MISPTag, dict]], **kwargs) -> MISPTag: def add_tag(self, tag: Optional[Union[str, MISPTag, dict]]=None, **kwargs) -> MISPTag:
return super()._add_tag(tag, **kwargs) return super()._add_tag(tag, **kwargs)
@property @property
@ -810,7 +810,7 @@ class MISPEvent(AbstractMISP):
self.SharingGroup: MISPSharingGroup self.SharingGroup: MISPSharingGroup
self.Tag: List[MISPTag] = [] self.Tag: List[MISPTag] = []
def add_tag(self, tag: Optional[Union[str, MISPTag, dict]], **kwargs) -> MISPTag: def add_tag(self, tag: Optional[Union[str, MISPTag, dict]]=None, **kwargs) -> MISPTag:
return super()._add_tag(tag, **kwargs) return super()._add_tag(tag, **kwargs)
@property @property
@ -987,7 +987,7 @@ class MISPEvent(AbstractMISP):
def load(self, json_event: Union[IO, str, bytes, dict], validate: bool=False, metadata_only: bool=False): def load(self, json_event: Union[IO, str, bytes, dict], validate: bool=False, metadata_only: bool=False):
"""Load a JSON dump from a pseudo file or a JSON string""" """Load a JSON dump from a pseudo file or a JSON string"""
if isinstance(json_event, IO): if isinstance(json_event, IOBase):
# python2 and python3 compatible to find if we have a file # python2 and python3 compatible to find if we have a file
json_event = json_event.read() json_event = json_event.read()
if isinstance(json_event, (str, bytes)): if isinstance(json_event, (str, bytes)):