MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Pull out __str__ function

stix2.1
Greg Back 2017-01-17 16:58:17 -08:00
parent 3e7adef792
commit 4eaa87660b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stix2/__init__.py
View File

@ -39,6 +39,11 @@ class _STIXBase(collections.Mapping):
raise ValueError("Cannot modify properties after creation.") raise ValueError("Cannot modify properties after creation.")
super(_STIXBase, self).__setattr__(name, value) super(_STIXBase, self).__setattr__(name, value)
def __str__(self):
# TODO: put keys in specific order. Probably need custom JSON encoder.
return json.dumps(self._dict(), indent=4, sort_keys=True,
separators=(",", ": ")) # Don't include spaces after commas.
class Indicator(_STIXBase): class Indicator(_STIXBase):
@ -83,9 +88,8 @@ class Indicator(_STIXBase):
'valid_from': valid_from or now, 'valid_from': valid_from or now,
} }
def __str__(self): def _dict(self):
# TODO: put keys in specific order. Probably need custom JSON encoder. return {
return json.dumps({
'type': self['type'], 'type': self['type'],
'id': self['id'], 'id': self['id'],
'created': format_datetime(self['created']), 'created': format_datetime(self['created']),
@ -93,7 +97,7 @@ class Indicator(_STIXBase):
'labels': self['labels'], 'labels': self['labels'],
'pattern': self['pattern'], 'pattern': self['pattern'],
'valid_from': format_datetime(self['valid_from']), 'valid_from': format_datetime(self['valid_from']),
}, indent=4, sort_keys=True, separators=(",", ": ")) # Don't include spaces after commas. }
class Malware(_STIXBase): class Malware(_STIXBase):
@ -136,13 +140,12 @@ class Malware(_STIXBase):
'name': name, 'name': name,
} }
def __str__(self): def _dict(self):
# TODO: put keys in specific order. Probably need custom JSON encoder. return {
return json.dumps({
'type': self['type'], 'type': self['type'],
'id': self['id'], 'id': self['id'],
'created': format_datetime(self['created']), 'created': format_datetime(self['created']),
'modified': format_datetime(self['modified']), 'modified': format_datetime(self['modified']),
'labels': self['labels'], 'labels': self['labels'],
'name': self['name'], 'name': self['name'],
}, indent=4, sort_keys=True, separators=(",", ": ")) # Don't include spaces after commas. }