From 750c7cd3dd98ec1be2ae27a3153fd359f2f0ce70 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 28 May 2014 17:41:29 +0200 Subject: [PATCH] always using utcnow on datetime objects --- sfa/managers/aggregate_manager_eucalyptus.py | 2 +- sfa/storage/model.py | 4 ++-- sfa/trust/speaksfor_util.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 228361d0..b8c83d8c 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -644,7 +644,7 @@ class AggregateManagerEucalyptus: ramdisk_id = instRamDisk, key_pair = instKey, inst_type = instType, - meta = Meta(start_time=datetime.datetime.now())) + meta = Meta(start_time=datetime.datetime.utcnow())) eucaInst.reserveInstance(conn, pubKeys) # xxx - should return altered rspec diff --git a/sfa/storage/model.py b/sfa/storage/model.py index 46e2deed..d50d3b6d 100644 --- a/sfa/storage/model.py +++ b/sfa/storage/model.py @@ -143,12 +143,12 @@ class RegRecord (Base,AlchemyObj): else: return GID(string=self.gid) def just_created (self): - now=datetime.now() + now=datetime.utcnow() self.date_created=now self.last_updated=now def just_updated (self): - now=datetime.now() + now=datetime.utcnow() self.last_updated=now #################### cross-relations tables diff --git a/sfa/trust/speaksfor_util.py b/sfa/trust/speaksfor_util.py index 5a5fd443..9a3b3c3d 100644 --- a/sfa/trust/speaksfor_util.py +++ b/sfa/trust/speaksfor_util.py @@ -348,7 +348,7 @@ def create_speaks_for(tool_gid, user_gid, ma_gid, \ credential_duration = datetime.timedelta(days=dur_days) - expiration = datetime.datetime.now(du_tz.tzutc()) + credential_duration + expiration = datetime.datetime.utcnow() + credential_duration expiration_str = expiration.strftime('%Y-%m-%dT%H:%M:%SZ') # FIXME: libabac can't handle .isoformat() version = "1.1" -- 2.43.0