From 2893b0a75c8453ca476abf2ca76c86bfd21ec58d Mon Sep 17 00:00:00 2001 From: bechtt Date: Mon, 17 Jun 2024 15:11:14 -0700 Subject: [PATCH] More attempts to fix tests --- omas/omas_ascii.py | 2 +- omas/omas_core.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omas/omas_ascii.py b/omas/omas_ascii.py index 7f5ae6259..596bbae00 100644 --- a/omas/omas_ascii.py +++ b/omas/omas_ascii.py @@ -8,7 +8,7 @@ def identify_imas_type(value): - if isinstance(value, (str, numpy.string_, numpy.unicode_, numpy.str_)): + if isinstance(value, (str, numpy.bytes_, numpy.unicode_, numpy.str_)): dtype = dict(type='50 (CHAR_DATA)', dim=1, size=(len(value),)) elif isinstance(value, (float, numpy.floating)): dtype = dict(type='52 (DOUBLE_DATA)', dim=0) diff --git a/omas/omas_core.py b/omas/omas_core.py index b178b014e..203121b70 100644 --- a/omas/omas_core.py +++ b/omas/omas_core.py @@ -57,7 +57,7 @@ def force_imas_type(value): value = value.values if isinstance(value, numpy.ndarray) and not len(value.shape): value = value.item() - if isinstance(value, (numpy.string_, numpy.unicode_, numpy.str_)): + if isinstance(value, (numpy.bytes_, numpy.unicode_, numpy.str_)): value = value.item() elif isinstance(value, (float, numpy.floating)): value = float(value)