Fix Deprecated datetime.datetime.utcnow()

requests_aws4auth/aws4auth.py

@@ -7,12 +7,12 @@
 # Licensed under the MIT License:
 # http://opensource.org/licenses/MIT
 
-import hmac
+import datetime
 import hashlib
+import hmac
 import posixpath
 import re
 import shlex
-import datetime
 
 try:
     import collections.abc as abc
@@ -381,7 +381,7 @@ def __call__(self, req):
             # replace them with x-amz-header with current date and time
             if 'date' in req.headers: del req.headers['date']
             if 'x-amz-date' in req.headers: del req.headers['x-amz-date']
-            now = datetime.datetime.utcnow()
+            now = datetime.datetime.now(datetime.UTC)
             req_date = now.date()
             req.headers['x-amz-date'] = now.strftime('%Y%m%dT%H%M%SZ')
         req_scope_date = req_date.strftime('%Y%m%d')

requests_aws4auth/test/test_live.py

@@ -18,9 +18,10 @@
 operations are performed!
 """
 
-import unittest
-import os
 import json
+import os
+import unittest
+from datetime import UTC
 
 live_access_id = os.getenv('AWS_ACCESS_ID')
 live_secret_key = os.getenv('AWS_ACCESS_KEY')
@@ -206,7 +207,7 @@ def test_mobileanalytics(self):
         url = 'https://mobileanalytics.us-east-1.amazonaws.com/2014-06-05/events'
         service = 'mobileanalytics'
         region = 'us-east-1'
-        dt = datetime.datetime.utcnow()
+        dt = datetime.datetime.now(UTC)
         date = dt.strftime('%Y%m%d')
         sig_key = AWS4SigningKey(live_secret_key, region, service, date)
         auth = AWS4Auth(live_access_id, sig_key)

requests_aws4auth/test/test_requests_aws4auth.py

@@ -24,24 +24,24 @@
 # Licensed under the MIT License:
 # http://opensource.org/licenses/MIT
 
-import os
-import unittest
-import re
+import datetime
 import hashlib
 import itertools
+import os
+import re
+import unittest
 import warnings
-import datetime
 from errno import ENOENT
-
 from urllib.parse import quote, urlparse, urlunparse
 
-import requests
 import httpx
+import requests
 
 from requests_aws4auth import AWS4Auth
 from requests_aws4auth.aws4signingkey import AWS4SigningKey
 from requests_aws4auth.exceptions import DateFormatError, NoSecretKeyError
 
+
 class SimpleNamespace:
     pass
 
@@ -196,10 +196,10 @@ def test_default_store_secret_key(self):
         self.assertEqual(obj.secret_key, 'secret_key')
 
     def test_date(self):
-        test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+        test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
         obj = AWS4SigningKey('secret_key', 'region', 'service')
         if obj.date != test_date:
-            test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+            test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
         self.assertEqual(obj.date, test_date)
 
     def test_amz_date(self):
@@ -209,10 +209,10 @@ def test_amz_date(self):
         """
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter('always')
-            test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+            test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
             obj = AWS4SigningKey('secret_key', 'region', 'service')
             if obj.amz_date != test_date:
-                test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+                test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
             self.assertEqual(obj.amz_date, test_date)
 
     def test_amz_date_warning(self):
@@ -315,7 +315,7 @@ def test_instantiation_generate_key(self):
 class AWS4Auth_Instantiate_Test(unittest.TestCase):
 
     def test_instantiate_from_args(self):
-        test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+        test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
         test_inc_hdrs = {'a', 'b', 'c'}
         auth = AWS4Auth('access_id',
                         'secret_key',
@@ -334,7 +334,7 @@ def test_instantiate_from_args(self):
         self.assertEqual(auth.signing_key.region, 'region')
         self.assertEqual(auth.signing_key.service, 'service')
         if test_date != auth.signing_key.date:
-            test_date = datetime.datetime.utcnow().strftime('%Y%m%d')
+            test_date = datetime.datetime.now(datetime.UTC).strftime('%Y%m%d')
         self.assertEqual(auth.signing_key.date, test_date)
         expected = '{}/region/service/aws4_request'.format(test_date)
         self.assertEqual(auth.signing_key.scope, expected)