From 261fc8d875c43d5421a6ee1096992fd636c2c278 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 15 Mar 2024 15:32:12 -0700 Subject: [PATCH] Fix datetime.utcnow deprecation warning --- datasette/app.py | 2 +- datasette/default_magic_parameters.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/datasette/app.py b/datasette/app.py index aa75d772..23d21600 100644 --- a/datasette/app.py +++ b/datasette/app.py @@ -930,7 +930,7 @@ class Datasette: used_default = True self._permission_checks.append( { - "when": datetime.datetime.utcnow().isoformat(), + "when": datetime.datetime.now(datetime.timezone.utc).isoformat(), "actor": actor, "action": action, "resource": resource, diff --git a/datasette/default_magic_parameters.py b/datasette/default_magic_parameters.py index 19382207..91c1c5aa 100644 --- a/datasette/default_magic_parameters.py +++ b/datasette/default_magic_parameters.py @@ -24,9 +24,12 @@ def now(key, request): if key == "epoch": return int(time.time()) elif key == "date_utc": - return datetime.datetime.utcnow().date().isoformat() + return datetime.datetime.now(datetime.timezone.utc).date().isoformat() elif key == "datetime_utc": - return datetime.datetime.utcnow().strftime(r"%Y-%m-%dT%H:%M:%S") + "Z" + return ( + datetime.datetime.now(datetime.timezone.utc).strftime(r"%Y-%m-%dT%H:%M:%S") + + "Z" + ) else: raise KeyError