From 19e5af143392a3c6f01c2876c4b8e4dd318950a5 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 25 Feb 2020 09:29:23 +0000 Subject: [PATCH] mgr/rbd_support: use dateutil parser intead of datetime fromisoformat fromisoformat is available since python 3.7 only. Signed-off-by: Mykola Golub --- ceph.spec.in | 2 ++ src/pybind/mgr/rbd_support/schedule.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index ecf33da8095fd..666e9d1eee996 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -584,11 +584,13 @@ Requires: python%{python3_version_nodots}-bcrypt Requires: python%{python3_version_nodots}-pyOpenSSL Requires: python%{python3_version_nodots}-requests Requires: python%{python3_version_nodots}-PyYAML +Requires: python%{python3_version_nodots}-dateutil %else Requires: python%{python3_pkgversion}-bcrypt Requires: python%{python3_pkgversion}-pecan Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-dateutil %endif %if 0%{?fedora} || 0%{?rhel} >= 8 Requires: python%{python3_pkgversion}-cherrypy diff --git a/src/pybind/mgr/rbd_support/schedule.py b/src/pybind/mgr/rbd_support/schedule.py index 3d72f4fae6689..5ca8b20e233f8 100644 --- a/src/pybind/mgr/rbd_support/schedule.py +++ b/src/pybind/mgr/rbd_support/schedule.py @@ -4,6 +4,7 @@ import rbd import re from datetime import datetime, timedelta, time +from dateutil.parser import parse from .common import get_rbd_pools @@ -243,7 +244,7 @@ class StartTime: return None try: - t = time.fromisoformat(start_time) + t = parse(start_time).timetz() except ValueError as e: raise ValueError("Invalid start time {}: {}".format(start_time, e)) -- 2.39.5