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

Merge pull request #63 from TheDr1ver/patch-5 

publish_timestamp Windows 7 Fix
pull/66/head
Raphaël Vinot 2017-03-15 14:16:00 +01:00 committed by GitHub
parent 8dd0914a73 d9bef7d65e
commit 7d34153e0e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pymisp/mispevent.py
View File

@ -165,7 +165,7 @@ class MISPAttribute(object):
if kwargs.get('uuid'): if kwargs.get('uuid'):
self.uuid = kwargs['uuid'] self.uuid = kwargs['uuid']
if kwargs.get('timestamp'): if kwargs.get('timestamp'):
self.timestamp = datetime.datetime.fromtimestamp(int(kwargs['timestamp'])) self.timestamp = datetime.datetime(1970, 1, 1) + datetime.timedelta(seconds=int(kwargs['timestamp']))
if kwargs.get('sharing_group_id'): if kwargs.get('sharing_group_id'):
self.sharing_group_id = int(kwargs['sharing_group_id']) self.sharing_group_id = int(kwargs['sharing_group_id'])
if kwargs.get('deleted'): if kwargs.get('deleted'):
@ -468,13 +468,13 @@ class MISPEvent(object):
if kwargs.get('attribute_count'): if kwargs.get('attribute_count'):
self.attribute_count = int(kwargs['attribute_count']) self.attribute_count = int(kwargs['attribute_count'])
if kwargs.get('timestamp'): if kwargs.get('timestamp'):
self.timestamp = datetime.datetime.fromtimestamp(int(kwargs['timestamp'])) self.timestamp = datetime.datetime(1970, 1, 1) + datetime.timedelta(seconds=int(kwargs['timestamp']))
if kwargs.get('proposal_email_lock'): if kwargs.get('proposal_email_lock'):
self.proposal_email_lock = kwargs['proposal_email_lock'] self.proposal_email_lock = kwargs['proposal_email_lock']
if kwargs.get('locked'): if kwargs.get('locked'):
self.locked = kwargs['locked'] self.locked = kwargs['locked']
if kwargs.get('publish_timestamp'): if kwargs.get('publish_timestamp'):
self.publish_timestamp = datetime.datetime.fromtimestamp(int(kwargs['publish_timestamp'])) self.publish_timestamp = datetime.datetime(1970, 1, 1) + datetime.timedelta(seconds=int(kwargs['publish_timestamp']))
if kwargs.get('sharing_group_id'): if kwargs.get('sharing_group_id'):
self.sharing_group_id = int(kwargs['sharing_group_id']) self.sharing_group_id = int(kwargs['sharing_group_id'])
if kwargs.get('Org'): if kwargs.get('Org'):