Replace to-be-deprecated utcnow() datetime calls with aware now() calls

Author: jenstroeger

src/webob/cookies.py

@@ -9,6 +9,7 @@
 import string
 import time
 import warnings
+import zoneinfo
 
 from webob.util import bytes_, text_
 
@@ -239,10 +240,13 @@ def serialize_cookie_date(v):
         v = timedelta(seconds=v)
 
     if isinstance(v, timedelta):
-        v = datetime.utcnow() + v
+        v = datetime.now(tz=zoneinfo.ZoneInfo("UTC")) + v
 
-    if isinstance(v, (datetime, date)):
+    if isinstance(v, datetime):
+        v = v.astimezone(zoneinfo.ZoneInfo("UTC")).timetuple()
+    elif isinstance(v, date):
         v = v.timetuple()
+
     r = time.strftime("%%s, %d-%%s-%Y %H:%M:%S GMT", v)
 
     return bytes_(r % (weekdays[v[6]], months[v[1]]), "ascii")

src/webob/response.py

@@ -6,6 +6,7 @@
 from urllib import parse as urlparse
 from urllib.parse import quote as url_quote
 import zlib
+import zoneinfo
 
 from webob.byterange import ContentRange
 from webob.cachecontrol import CacheControl, serialize_cache_control
@@ -1259,15 +1260,15 @@ def _cache_expires(self, seconds=0, **kw):
             cache_control.max_age = 0
             cache_control.post_check = 0
             cache_control.pre_check = 0
-            self.expires = datetime.utcnow()
+            self.expires = datetime.now(tz=zoneinfo.ZoneInfo("UTC")).replace(tzinfo=None)
 
             if "last-modified" not in self.headers:
-                self.last_modified = datetime.utcnow()
+                self.last_modified = datetime.now(tz=zoneinfo.ZoneInfo("UTC")).replace(tzinfo=None)
             self.pragma = "no-cache"
         else:
             cache_control.properties.clear()
             cache_control.max_age = seconds
-            self.expires = datetime.utcnow() + timedelta(seconds=seconds)
+            self.expires = datetime.now(tz=zoneinfo.ZoneInfo("UTC")).replace(tzinfo=None) + timedelta(seconds=seconds)
             self.pragma = None
 
         for name, value in kw.items():