]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rbd_support: use dateutil parser intead of datetime fromisoformat
authorMykola Golub <mgolub@suse.com>
Tue, 25 Feb 2020 09:29:23 +0000 (09:29 +0000)
committerMykola Golub <mgolub@suse.com>
Tue, 25 Feb 2020 09:52:22 +0000 (09:52 +0000)
fromisoformat is available since python 3.7 only.

Signed-off-by: Mykola Golub <mgolub@suse.com>
ceph.spec.in
src/pybind/mgr/rbd_support/schedule.py

index ecf33da8095fddc9d4f6a8a77cacad69a17e394f..666e9d1eee996b80e9dcecf65159be7660e8d228 100644 (file)
@@ -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
index 3d72f4fae66896e46b9e2cdfed7fbf343f3b9e7e..5ca8b20e233f80686456e1bd0ca9673e4482a047 100644 (file)
@@ -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))