From 5320b39912863fba52a912975409b6804d4de629 Mon Sep 17 00:00:00 2001 From: Cory Lorenz Date: Fri, 12 Sep 2014 15:37:22 -0700 Subject: [PATCH] Make S3 Model Timestamps Consistent By Using UTC UTC seems to be default timezone for AWS, and the time strings are reporting as GMT, yet the date time is the local time zone. --- moto/s3/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/moto/s3/models.py b/moto/s3/models.py index c09233095..f9ed3c0df 100644 --- a/moto/s3/models.py +++ b/moto/s3/models.py @@ -22,7 +22,7 @@ class FakeKey(object): def __init__(self, name, value, storage="STANDARD", etag=None, is_versioned=False, version_id=0): self.name = name self.value = value - self.last_modified = datetime.datetime.now() + self.last_modified = datetime.datetime.utcnow() self._storage_class = storage self._metadata = {} self._expiry = None @@ -47,7 +47,7 @@ class FakeKey(object): def append_to_value(self, value): self.value += value - self.last_modified = datetime.datetime.now() + self.last_modified = datetime.datetime.utcnow() self._etag = None # must recalculate etag if self._is_versioned: self._version_id += 1 @@ -55,7 +55,7 @@ class FakeKey(object): self._is_versioned = 0 def restore(self, days): - self._expiry = datetime.datetime.now() + datetime.timedelta(days) + self._expiry = datetime.datetime.utcnow() + datetime.timedelta(days) @property def etag(self):