Stay with minversion 3.6 (and require module we already use elsewhere)

Fixes #2770
This commit is contained in:
Stephan Kulow 2022-03-25 09:43:04 +01:00
parent e25e4b7cee
commit 6f1314730c
2 changed files with 2 additions and 2 deletions

View File

@ -881,7 +881,7 @@ class StagingAPI(object):
""" """
freezetime = attribute_value_load(self.apiurl, project, 'FreezeTime') freezetime = attribute_value_load(self.apiurl, project, 'FreezeTime')
if freezetime: if freezetime:
freezetime = datetime.fromisoformat(freezetime) freezetime = dateutil.parser.isoparse(freezetime)
tz_info = freezetime.tzinfo tz_info = freezetime.tzinfo
return (datetime.now(tz_info) - freezetime).total_seconds() / 3600 / 24 return (datetime.now(tz_info) - freezetime).total_seconds() / 3600 / 24
# fallback: old method # fallback: old method

View File

@ -152,7 +152,7 @@ class TestCase(unittest.TestCase):
try: try:
env = os.environ env = os.environ
env['OSC_CONFIG'] = OSCRC env['OSC_CONFIG'] = OSCRC
self.output = subprocess.check_output(args, stderr=subprocess.STDOUT, text=True, env=env) self.output = subprocess.check_output(args, stderr=subprocess.STDOUT, universal_newlines=True, env=env)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(e.output) print(e.output)
raise e raise e