Skip to content

Commit 1784cc2

Browse files
committed
utils: Fix datetime_to_timestamp
Replace usage of deprecated function `datetime.utcfromtimestamp` and make sure the input date is UTC before subtracting. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 6ceb082 commit 1784cc2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker/utils/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import os.path
66
import shlex
77
import string
8-
from datetime import datetime
8+
from datetime import datetime, timezone
99
from packaging.version import Version
1010

1111
from .. import errors
@@ -394,8 +394,8 @@ def convert_filters(filters):
394394

395395

396396
def datetime_to_timestamp(dt):
397-
"""Convert a UTC datetime to a Unix timestamp"""
398-
delta = dt - datetime.utcfromtimestamp(0)
397+
"""Convert a datetime to a Unix timestamp"""
398+
delta = dt.astimezone(timezone.utc) - datetime(1970, 1, 1, tzinfo=timezone.utc)
399399
return delta.seconds + delta.days * 24 * 3600
400400

401401

0 commit comments

Comments
 (0)