From: Andreas Schneider <asn@samba.org>
Date: Tue, 2 Feb 2021 12:44:01 +0000 (+0100)
Subject: selftest: Add support for python-dateutil >= 2.7.1
X-Git-Tag: tevent-0.11.0~1846
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35459b753aff4dfa7c7e7c70c9783844705a42c0;p=thirdparty%2Fsamba.git

selftest: Add support for python-dateutil >= 2.7.1

This uses the more widespread python-dateutil instead of python-iso8601.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Feb  2 19:53:35 UTC 2021 on sn-devel-184
---

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 989a39fb03f..fd356d92156 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -24,8 +24,14 @@ import sys
 import os
 from samba import subunit
 from samba.subunit.run import TestProtocolClient
-import iso8601
 import unittest
+try:
+    from dateutil.parser import isoparse as iso_parse_date
+except ImportError:
+    try:
+        from iso8601 import parse_date as iso_parse_date;
+    except ImportError:
+        print('Install either python-dateutil >= 2.7.1 or python-iso8601')
 
 
 VALID_RESULTS = set(['success', 'successful', 'failure', 'fail', 'skip',
@@ -63,7 +69,7 @@ def parse_results(msg_ops, statistics, fh):
         elif command == "time":
             msg_ops.control_msg(l)
             try:
-                dt = iso8601.parse_date(arg.rstrip("\n"))
+                dt = iso_parse_date(arg.rstrip("\n"))
             except TypeError as e:
                 print("Unable to parse time line: %s" % arg.rstrip("\n"))
             else: