Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Always convert datetime to UNIX timestamp in Travis-Ci backend.

Browse source 
Python can't perform comparisons between offset-aware and
offset-naive dateime objects. Instead, convert them to UTC
timestamps before comparisons.
This commit is contained in:
Fabio Manganiello 2020-01-19 15:35:13 +01:00
parent c44de5e2d7
commit bbb52ba191
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platypush/backend/travisci.py
View file

@ -34,24 +34,20 @@ class TravisciBackend(Backend):
self._last_build_finished_at = None self._last_build_finished_at = None
@staticmethod @staticmethod
def _convert_iso_date_to_shitty_python_datetime(d): def _convert_iso_date(d):
""" if isinstance(d, int) or isinstance(d, float):
Python's datetime is dumb and shitty, and it won't understand dates in formats such as '2020-01-01:00:00:00Z', return d
even though they're perfectly fine formatted ISO dates.
"""
if isinstance(d, str): if isinstance(d, str):
if d.endswith('Z'): if d.endswith('Z'):
d = d[:-1] + '+00:00' d = d[:-1] + '+00:00'
return datetime.datetime.fromisoformat(d) d = datetime.datetime.fromisoformat(d)
if isinstance(d, int) or isinstance(d, float):
return datetime.datetime.fromtimestamp(d)
assert isinstance(d, datetime.datetime) assert isinstance(d, datetime.datetime)
return d return d.timestamp()
def __enter__(self): def __enter__(self):
self._last_build_finished_at = self._convert_iso_date_to_shitty_python_datetime( self._last_build_finished_at = self._convert_iso_date(
get_plugin('variable').get(self._last_build_finished_at_varname). get_plugin('variable').get(self._last_build_finished_at_varname).
output.get(self._last_build_finished_at_varname) or 0) output.get(self._last_build_finished_at_varname) or 0)
@ -63,7 +59,7 @@ class TravisciBackend(Backend):
return return
last_build = builds[0] last_build = builds[0]
last_build_finished_at = self._convert_iso_date_to_shitty_python_datetime(last_build.get('finished_at', 0)) last_build_finished_at = self._convert_iso_date(last_build.get('finished_at', 0))
if self._last_build_finished_at and last_build_finished_at <= self._last_build_finished_at: if self._last_build_finished_at and last_build_finished_at <= self._last_build_finished_at:
return return
@ -87,11 +83,11 @@ class TravisciBackend(Backend):
commit_id=last_build.get('commit', {}).get('id'), commit_id=last_build.get('commit', {}).get('id'),
commit_sha=last_build.get('commit', {}).get('sha'), commit_sha=last_build.get('commit', {}).get('sha'),
commit_message=last_build.get('commit', {}).get('message'), commit_message=last_build.get('commit', {}).get('message'),
committed_at=self._convert_iso_date_to_shitty_python_datetime( committed_at=self._convert_iso_date(
last_build.get('commit', {}).get('committed_at')), last_build.get('commit', {}).get('committed_at')),
created_by=last_build.get('created_by', {}).get('login'), created_by=last_build.get('created_by', {}).get('login'),
started_at=self._convert_iso_date_to_shitty_python_datetime(last_build.get('started_at')), started_at=self._convert_iso_date(last_build.get('started_at')),
finished_at=self._convert_iso_date_to_shitty_python_datetime(last_build.get('finished_at'))) finished_at=self._convert_iso_date(last_build.get('finished_at')))
self.bus.post(evt) self.bus.post(evt)
self._last_build_finished_at = last_build_finished_at self._last_build_finished_at = last_build_finished_at