From e107158e9beda140f18c4ef55c755a1d720934a4 Mon Sep 17 00:00:00 2001 From: Lisa Zangrando Date: Fri, 27 Jan 2017 13:46:41 +0100 Subject: [PATCH] Time data does not match format '%Y-%m-%dT%H:%M:%S.%fZ' Bug: #1659807 Change-Id: Iec6bf294562d9df8d2db7dbd212b7d35e91ad43a Sem-Ver: bugfix --- synergy_scheduler_manager/common/token.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/synergy_scheduler_manager/common/token.py b/synergy_scheduler_manager/common/token.py index df54ae1..6c360d2 100644 --- a/synergy_scheduler_manager/common/token.py +++ b/synergy_scheduler_manager/common/token.py @@ -45,11 +45,25 @@ class Token(SynergyObject): token.setId(id) data = data["token"] - token.setCreation(datetime.strptime(data["issued_at"], - "%Y-%m-%dT%H:%M:%S.%fZ")) + issued_at = None + expires_at = None - token.setExpiration(datetime.strptime(data["expires_at"], - "%Y-%m-%dT%H:%M:%S.%fZ")) + try: + issued_at = datetime.strptime(data["issued_at"], + "%Y-%m-%dT%H:%M:%S.%fZ") + except Exception: + issued_at = datetime.strptime(data["issued_at"], + "%Y-%m-%dT%H:%M:%S.%f") + + try: + expires_at = datetime.strptime(data["expires_at"], + "%Y-%m-%dT%H:%M:%S.%fZ") + except Exception: + expires_at = datetime.strptime(data["expires_at"], + "%Y-%m-%dT%H:%M:%S.%f") + + token.setCreation(issued_at) + token.setExpiration(expires_at) project = Project() project.setId(data["project"]["id"])