diff --git a/kafka/net/sasl/msk.py b/kafka/net/sasl/msk.py index aa513b06f..12dd59bf8 100644 --- a/kafka/net/sasl/msk.py +++ b/kafka/net/sasl/msk.py @@ -92,7 +92,7 @@ def __init__(self, host, access_key, secret_key, region, token=None): self.service = 'kafka-cluster' self.action = '{}:Connect'.format(self.service) - now = datetime.datetime.utcnow() + now = datetime.datetime.now(datetime.timezone.utc) self.datestamp = now.strftime('%Y%m%d') self.timestamp = now.strftime('%Y%m%dT%H%M%SZ') diff --git a/test/net/sasl/test_msk.py b/test/net/sasl/test_msk.py index 48ff8c745..ffe98ab1e 100644 --- a/test/net/sasl/test_msk.py +++ b/test/net/sasl/test_msk.py @@ -1,18 +1,15 @@ import datetime import json -import sys from unittest import mock from kafka.net.sasl.msk import AwsMskIamClient, SaslMechanismAwsMskIam def client_factory(token=None): - if sys.version_info >= (3, 3): - now = datetime.datetime.fromtimestamp(1629321911, datetime.timezone.utc) - else: - now = datetime.datetime.utcfromtimestamp(1629321911) + now = datetime.datetime.fromtimestamp(1629321911, datetime.timezone.utc) with mock.patch('kafka.net.sasl.msk.datetime') as mock_dt: - mock_dt.datetime.utcnow = mock.Mock(return_value=now) + mock_dt.timezone.utc = datetime.timezone.utc + mock_dt.datetime.now = mock.Mock(return_value=now) return AwsMskIamClient( host='localhost', access_key='XXXXXXXXXXXXXXXXXXXX',