catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup some incorrect date formats.

Browse source
This commit is contained in:
Steve Pulec 2014-11-29 23:34:40 -05:00
commit 1a015d0e39
9 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/core/utils.py
View file

@ -80,8 +80,8 @@ class convert_flask_to_httpretty_response(object):
return response, status, headers
def iso_8601_datetime(datetime):
return datetime.strftime("%Y-%m-%dT%H:%M:%SZ")
def iso_8601_datetime_with_milliseconds(datetime):
return datetime.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + 'Z'
def rfc_1123_datetime(datetime):

4
moto/s3/models.py
View file

@ -9,7 +9,7 @@ import codecs
import six
from moto.core import BaseBackend
from moto.core.utils import iso_8601_datetime, rfc_1123_datetime
from moto.core.utils import iso_8601_datetime_with_milliseconds, rfc_1123_datetime
from .exceptions import BucketAlreadyExists, MissingBucket
from .utils import clean_key_name, _VersionedKeyStore
@ -71,7 +71,7 @@ class FakeKey(object):
@property
def last_modified_ISO8601(self):
return iso_8601_datetime(self.last_modified)
return iso_8601_datetime_with_milliseconds(self.last_modified)
@property
def last_modified_RFC1123(self):

4
moto/sns/models.py
View file

@ -9,7 +9,7 @@ import six
from moto.compat import OrderedDict
from moto.core import BaseBackend
from moto.core.utils import iso_8601_datetime
from moto.core.utils import iso_8601_datetime_with_milliseconds
from moto.sqs import sqs_backends
from .utils import make_arn_for_topic, make_arn_for_subscription
@ -69,7 +69,7 @@ class Subscription(object):
"TopicArn": self.topic.arn,
"Subject": "my subject",
"Message": message,
"Timestamp": iso_8601_datetime(datetime.datetime.now()),
"Timestamp": iso_8601_datetime_with_milliseconds(datetime.datetime.now()),
"SignatureVersion": "1",
"Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",
"SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",

6
moto/sts/models.py
View file

@ -1,7 +1,7 @@
from __future__ import unicode_literals
import datetime
from moto.core import BaseBackend
from moto.core.utils import iso_8601_datetime
from moto.core.utils import iso_8601_datetime_with_milliseconds
class Token(object):
@ -13,7 +13,7 @@ class Token(object):
@property
def expiration_ISO8601(self):
return iso_8601_datetime(self.expiration)
return iso_8601_datetime_with_milliseconds(self.expiration)
class AssumedRole(object):
@ -27,7 +27,7 @@ class AssumedRole(object):
@property
def expiration_ISO8601(self):
return iso_8601_datetime(self.expiration)
return iso_8601_datetime_with_milliseconds(self.expiration)
class STSBackend(BaseBackend):