From eb0affcb09ebbd45f5ac711e8ed764e804c4a13d Mon Sep 17 00:00:00 2001 From: com-sixs Date: Mon, 29 Oct 2018 09:37:39 +0100 Subject: another string issue... --- binoculars/backends/sixs.py | 6 +----- binoculars/util.py | 9 ++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/binoculars/backends/sixs.py b/binoculars/backends/sixs.py index f635b73..54cdf60 100644 --- a/binoculars/backends/sixs.py +++ b/binoculars/backends/sixs.py @@ -39,6 +39,7 @@ from pyFAI.detectors import ALL_DETECTORS from gi.repository import Hkl from .. import backend, errors, util +from ..util import as_string # TODO # - Angles delta gamma. nom de 2 ou 3 moteurs. omega puis delta @@ -209,11 +210,6 @@ def get_nxclass(hfile, nxclass, path="/"): pass return None -def as_string(text): - if hasattr(text, "decode"): - text = text.decode() - return text - def node_as_string(node): if node.shape == (): content = node.read().tostring() diff --git a/binoculars/util.py b/binoculars/util.py index 4ef8377..7eca101 100755 --- a/binoculars/util.py +++ b/binoculars/util.py @@ -35,6 +35,13 @@ else: import cPickle as pickle import ConfigParser as configparser + +def as_string(text): + if hasattr(text, "decode"): + text = text.decode() + return text + + class OrderedOperation(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): oops = getattr(namespace, 'ordered_operations', []) @@ -523,7 +530,7 @@ class ConfigFile(MetaBase): try: config = fp['configuration'] if 'command' in config.attrs: - configobj.command = json.loads(config.attrs['command'].decode('utf8')) + configobj.command = json.loads(as_string(config.attrs['command'])) for section in config: if isinstance(config[section], h5py._hl.group.Group): # new setattr(configobj, section, dict((key, config[section][key].value) for key in config[section])) -- cgit v1.2.3