Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #208 from clorenz7/master

Browse Source 
Make S3 Model Timestamps Consistent By Using UTC
This commit is contained in:
Steve Pulec 2014-09-15 20:53:35 -04:00
commit 2650d9981f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/s3/models.py
View File

@ -22,7 +22,7 @@ class FakeKey(object):
def __init__(self, name, value, storage="STANDARD", etag=None, is_versioned=False, version_id=0): def __init__(self, name, value, storage="STANDARD", etag=None, is_versioned=False, version_id=0):
self.name = name self.name = name
self.value = value self.value = value
self.last_modified = datetime.datetime.now() self.last_modified = datetime.datetime.utcnow()
self._storage_class = storage self._storage_class = storage
self._metadata = {} self._metadata = {}
self._expiry = None self._expiry = None
@ -47,7 +47,7 @@ class FakeKey(object):
def append_to_value(self, value): def append_to_value(self, value):
self.value += value self.value += value
self.last_modified = datetime.datetime.now() self.last_modified = datetime.datetime.utcnow()
self._etag = None # must recalculate etag self._etag = None # must recalculate etag
if self._is_versioned: if self._is_versioned:
self._version_id += 1 self._version_id += 1
@ -55,7 +55,7 @@ class FakeKey(object):
self._is_versioned = 0 self._is_versioned = 0
def restore(self, days): def restore(self, days):
self._expiry = datetime.datetime.now() + datetime.timedelta(days) self._expiry = datetime.datetime.utcnow() + datetime.timedelta(days)
@property @property
def etag(self): def etag(self):