Skip to content

Commit 5d13cbe

Browse files
committed
Use shared RFC 3339 timestamp format string in storage.
1 parent d4d5d4d commit 5d13cbe

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

gcloud/storage/blob.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
from gcloud.storage._helpers import _scalar_property
3636
from gcloud.storage import _implicit_environ
3737
from gcloud.storage.acl import ObjectACL
38+
from gcloud._helpers import _RFC3339_MICROS
3839

3940

4041
_API_ACCESS_ENDPOINT = 'https://storage.googleapis.com'
41-
_GOOGLE_TIMESTAMP_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
4242

4343

4444
class Blob(_PropertyMixin):
@@ -749,7 +749,7 @@ def time_deleted(self):
749749
"""
750750
value = self._properties.get('timeDeleted')
751751
if value is not None:
752-
return datetime.datetime.strptime(value, _GOOGLE_TIMESTAMP_FORMAT)
752+
return datetime.datetime.strptime(value, _RFC3339_MICROS)
753753

754754
@property
755755
def updated(self):
@@ -763,7 +763,7 @@ def updated(self):
763763
"""
764764
value = self._properties.get('updated')
765765
if value is not None:
766-
return datetime.datetime.strptime(value, _GOOGLE_TIMESTAMP_FORMAT)
766+
return datetime.datetime.strptime(value, _RFC3339_MICROS)
767767

768768

769769
class _UploadConfig(object):

gcloud/storage/bucket.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from gcloud.storage.acl import DefaultObjectACL
4747
from gcloud.storage.iterator import Iterator
4848
from gcloud.storage.blob import Blob
49-
from gcloud.storage.blob import _GOOGLE_TIMESTAMP_FORMAT
49+
from gcloud._helpers import _RFC3339_MICROS
5050

5151

5252
class _BlobIterator(Iterator):
@@ -693,7 +693,7 @@ def time_created(self):
693693
"""
694694
value = self._properties.get('timeCreated')
695695
if value is not None:
696-
return datetime.datetime.strptime(value, _GOOGLE_TIMESTAMP_FORMAT)
696+
return datetime.datetime.strptime(value, _RFC3339_MICROS)
697697

698698
@property
699699
def versioning_enabled(self):

gcloud/storage/test_blob.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,11 +1016,12 @@ def test_storage_class(self):
10161016

10171017
def test_time_deleted(self):
10181018
import datetime
1019+
from gcloud._helpers import _RFC3339_MICROS
10191020
BLOB_NAME = 'blob-name'
10201021
connection = _Connection()
10211022
bucket = _Bucket(connection)
10221023
TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37)
1023-
TIME_DELETED = TIMESTAMP.isoformat() + '.000Z'
1024+
TIME_DELETED = TIMESTAMP.strftime(_RFC3339_MICROS)
10241025
properties = {'timeDeleted': TIME_DELETED}
10251026
blob = self._makeOne(BLOB_NAME, bucket=bucket, properties=properties)
10261027
self.assertEqual(blob.time_deleted, TIMESTAMP)
@@ -1032,11 +1033,12 @@ def test_time_deleted_unset(self):
10321033

10331034
def test_updated(self):
10341035
import datetime
1036+
from gcloud._helpers import _RFC3339_MICROS
10351037
BLOB_NAME = 'blob-name'
10361038
connection = _Connection()
10371039
bucket = _Bucket(connection)
10381040
TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37)
1039-
UPDATED = TIMESTAMP.isoformat() + '.000Z'
1041+
UPDATED = TIMESTAMP.strftime(_RFC3339_MICROS)
10401042
properties = {'updated': UPDATED}
10411043
blob = self._makeOne(BLOB_NAME, bucket=bucket, properties=properties)
10421044
self.assertEqual(blob.updated, TIMESTAMP)

gcloud/storage/test_bucket.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,9 @@ def test_storage_class(self):
790790

791791
def test_time_created(self):
792792
import datetime
793+
from gcloud._helpers import _RFC3339_MICROS
793794
TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37)
794-
TIME_CREATED = TIMESTAMP.isoformat() + '.000Z'
795+
TIME_CREATED = TIMESTAMP.strftime(_RFC3339_MICROS)
795796
properties = {'timeCreated': TIME_CREATED}
796797
bucket = self._makeOne(properties=properties)
797798
self.assertEqual(bucket.time_created, TIMESTAMP)

0 commit comments

Comments
 (0)