From 9883ba87aa4469193931923f74d47de167d355ba Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 29 Jan 2021 13:13:49 -0500
Subject: [PATCH] Accommodate newer aniso8601
---
src/_zkapauthorizer/model.py | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py
index 12b0393..7c62b8f 100644
--- a/src/_zkapauthorizer/model.py
+++ b/src/_zkapauthorizer/model.py
@@ -40,7 +40,7 @@ from sqlite3 import (
import attr
from aniso8601 import (
- parse_datetime,
+ parse_datetime as _parse_datetime,
)
from twisted.logger import (
Logger,
@@ -72,6 +72,18 @@ from .schema import (
)
+def parse_datetime(s, **kw):
+ """
+ Like ``aniso8601.parse_datetime`` but accept unicode as well.
+ """
+ if isinstance(s, unicode):
+ s = s.encode("utf-8")
+ assert isinstance(s, bytes)
+ if "delimiter" in kw and isinstance(kw["delimiter"], unicode):
+ kw["delimiter"] = kw["delimiter"].encode("utf-8")
+ return _parse_datetime(s, **kw)
+
+
class ILeaseMaintenanceObserver(Interface):
"""
An object which is interested in receiving events related to the progress
--
GitLab