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

pull/430/head
Raphaël Vinot 2019-07-30 20:15:15 +02:00
commit 1f6c238370
1 changed files with 1 additions and 1 deletions

View File

@ -1703,7 +1703,7 @@ class ExpandedPyMISP(PyMISP):
def _make_timestamp(self, value: DateTypes):
'''Catch-all method to normalize anything that can be converted to a timestamp'''
if isinstance(value, datetime):
return datetime.timestamp()
return value.timestamp()
elif isinstance(value, date):
return datetime.combine(value, datetime.max.time()).timestamp()
elif isinstance(value, str):