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

fix: Syntax and typos

pull/531/head
Raphaël Vinot 2020-01-28 14:12:39 +01:00
parent f43266fcf2
commit 98e1feefa1
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/abstract.py
View File

@ -110,7 +110,7 @@ class AbstractMISP(MutableMapping, MISPFileCache, metaclass=ABCMeta):
super().__init__() super().__init__()
self.__edited: bool = True # As we create a new object, we assume it is edited self.__edited: bool = True # As we create a new object, we assume it is edited
self.__not_jsonable: list = [] self.__not_jsonable: list = []
self._fields_for_feed: set = {} self._fields_for_feed: set
self.__self_defined_describe_types: Union[dict, None] = None self.__self_defined_describe_types: Union[dict, None] = None
self.uuid: str self.uuid: str

2
pymisp/data/misp-objects

@ -1 +1 @@
Subproject commit e6659c7c7ebdd8dd90af3a3e32c7ce002842f40b Subproject commit fb878a6901777fe1612c984427d0ea8ddf19f048

20
pymisp/mispevent.py
View File

@ -52,6 +52,7 @@ def _int_to_str(d: dict):
d[k] = str(v) d[k] = str(v)
return d return d
def _make_datetime(value) -> datetime: def _make_datetime(value) -> datetime:
if isinstance(value, (int, float)): if isinstance(value, (int, float)):
# Timestamp # Timestamp
@ -76,12 +77,12 @@ def _make_datetime(value) -> datetime:
value = datetime.strptime(value, "%Y-%m-%d") value = datetime.strptime(value, "%Y-%m-%d")
except Exception: except Exception:
value = parse(value) value = parse(value)
elif isinstance(value, date):
value = datetime.combine(value, datetime.min.time())
elif isinstance(value, datetime): elif isinstance(value, datetime):
pass pass
elif isinstance(value, date): # NOTE: date has to be *after* datetime, or it will be overwritten
value = datetime.combine(value, datetime.min.time())
else: else:
raise PyMISPError(f'Invalid format for {value}: {type(value)}.') raise PyMISPError(f'Invalid format for {value}: {type(value)}.')
if not value.tzinfo: if not value.tzinfo:
# set localtimezone if not present # set localtimezone if not present
@ -114,6 +115,7 @@ class MISPOrganisation(AbstractMISP):
kwargs = kwargs['Organisation'] kwargs = kwargs['Organisation']
super(MISPOrganisation, self).from_dict(**kwargs) super(MISPOrganisation, self).from_dict(**kwargs)
class MISPSharingGroup(AbstractMISP): class MISPSharingGroup(AbstractMISP):
def from_dict(self, **kwargs): def from_dict(self, **kwargs):
@ -122,7 +124,6 @@ class MISPSharingGroup(AbstractMISP):
super().from_dict(**kwargs) super().from_dict(**kwargs)
class MISPShadowAttribute(AbstractMISP): class MISPShadowAttribute(AbstractMISP):
def __init__(self): def __init__(self):
@ -415,7 +416,7 @@ class MISPAttribute(AbstractMISP):
self.first_seen = datetime.fromisoformat(fs) self.first_seen = datetime.fromisoformat(fs)
else: else:
self.first_seen = datetime.strptime(fs, "%Y-%m-%dT%H:%M:%S.%f%z") self.first_seen = datetime.strptime(fs, "%Y-%m-%dT%H:%M:%S.%f%z")
except: except Exception:
# Use __setattr__ # Use __setattr__
self.first_seen = fs self.first_seen = fs
@ -427,7 +428,7 @@ class MISPAttribute(AbstractMISP):
self.last_seen = datetime.fromisoformat(ls) self.last_seen = datetime.fromisoformat(ls)
else: else:
self.last_seen = datetime.strptime(ls, "%Y-%m-%dT%H:%M:%S.%f%z") self.last_seen = datetime.strptime(ls, "%Y-%m-%dT%H:%M:%S.%f%z")
except: except Exception:
# Use __setattr__ # Use __setattr__
self.last_seen = ls self.last_seen = ls
@ -1009,7 +1010,7 @@ class MISPEvent(AbstractMISP):
required = ['info', 'Orgc'] required = ['info', 'Orgc']
for r in required: for r in required:
if not hasattr(self, r): if not hasattr(self, r):
raise PyMISPError('The field {} is required to generate the event feed output.') raise PyMISPError(f'The field {r} is required to generate the event feed output.')
if (hasattr(self, 'distribution') if (hasattr(self, 'distribution')
and self.distribution is not None and self.distribution is not None
@ -1141,7 +1142,7 @@ class MISPEvent(AbstractMISP):
if sys.version_info >= (3, 7): if sys.version_info >= (3, 7):
try: try:
# faster # faster
value = date.fromisoformat(fs) value = date.fromisoformat(value)
except Exception: except Exception:
value = parse(value).date() value = parse(value).date()
else: else:
@ -1157,7 +1158,7 @@ class MISPEvent(AbstractMISP):
def set_date(self, d: Optional[Union[str, int, float, datetime, date]]=None, ignore_invalid: bool=False): def set_date(self, d: Optional[Union[str, int, float, datetime, date]]=None, ignore_invalid: bool=False):
"""Set a date for the event (string, datetime, or date object)""" """Set a date for the event (string, datetime, or date object)"""
if isinstance(d, (str, int, float, datetime, date)): if isinstance(d, (str, int, float, datetime, date)):
self.date = d # type: ignore self.date = d # type: ignore
elif ignore_invalid: elif ignore_invalid:
self.date = date.today() self.date = date.today()
else: else:
@ -1600,7 +1601,6 @@ class MISPObjectAttribute(MISPAttribute):
super().__init__() super().__init__()
self._definition = definition self._definition = definition
def from_dict(self, object_relation: str, value: Union[str, int, float], **kwargs): # type: ignore def from_dict(self, object_relation: str, value: Union[str, int, float], **kwargs): # type: ignore
# NOTE: Signature of "from_dict" incompatible with supertype "MISPAttribute" # NOTE: Signature of "from_dict" incompatible with supertype "MISPAttribute"
self.object_relation = object_relation self.object_relation = object_relation