Skip to content

Commit 4fb657b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Replace deprecated datetime.utcfromtimestamp"
2 parents 6b35e33 + e7115aa commit 4fb657b

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

glanceclient/common/utils.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,18 @@ def print_cached_images(cached_images):
208208
if last_accessed == 0:
209209
last_accessed = "N/A"
210210
else:
211-
last_accessed = datetime.datetime.utcfromtimestamp(
212-
last_accessed).isoformat()
213-
214-
cache_pt.add_row((image['image_id'], state,
215-
last_accessed,
216-
datetime.datetime.utcfromtimestamp(
217-
image['last_modified']).isoformat(),
218-
image['size'],
219-
image['hits']))
211+
last_accessed = datetime.datetime.fromtimestamp(
212+
last_accessed, tz=datetime.timezone.utc
213+
).replace(tzinfo=None).isoformat()
214+
215+
cache_pt.add_row((
216+
image['image_id'], state,
217+
last_accessed,
218+
datetime.datetime.fromtimestamp(
219+
image['last_modified'], tz=datetime.timezone.utc
220+
).replace(tzinfo=None).isoformat(),
221+
image['size'],
222+
image['hits']))
220223
else:
221224
for image in cached_images[item]:
222225
cache_pt.add_row((image,

0 commit comments

Comments
 (0)