From 379547a9974bee51a174cbb86c7808d148ed8596 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 2 Nov 2020 14:40:28 +0100
Subject: [PATCH] SW-000: fix for new h5py version
---
QA/QA_Common/lib/hdf5_io.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/QA/QA_Common/lib/hdf5_io.py b/QA/QA_Common/lib/hdf5_io.py
index 87a02c44960..ec1814dbfb1 100644
--- a/QA/QA_Common/lib/hdf5_io.py
+++ b/QA/QA_Common/lib/hdf5_io.py
@@ -661,7 +661,8 @@ def combine_hypercubes(input_paths, output_dir, output_filename=None, do_compres
if len(versions) != 1:
raise ValueError('Cannot combine h5 files of multiple versions: %s' % (', '.join(versions),))
- version_str = list(versions)[0]
+ versions = [v.decode('utf-8') if isinstance(v, bytes) else v for v in versions]
+ version_str = versions[0]
if version_str != '1.4':
raise ValueError('Cannot read version %s' % (version_str,))
--
GitLab