From ae42d4a7bf5f2bcb8e786e1de6a83acdbcabead8 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 3 Feb 2022 15:18:36 +0100 Subject: [PATCH] import json_validate into slic.utils; remove unneeded import --- slic/core/acquisition/broker_client.py | 3 +-- slic/utils/__init__.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/slic/core/acquisition/broker_client.py b/slic/core/acquisition/broker_client.py index 828ea48ca..0b1ba61f6 100644 --- a/slic/core/acquisition/broker_client.py +++ b/slic/core/acquisition/broker_client.py @@ -1,5 +1,4 @@ import requests -import json from glob import glob from time import sleep from yaspin import yaspin @@ -7,7 +6,7 @@ from yaspin.spinners import Spinners import numpy as np from slic.utils import xrange, tqdm_mod, tqdm_sleep -from slic.utils.json import json_validate +from slic.utils import json_validate from .broker_tools import get_current_pulseid diff --git a/slic/utils/__init__.py b/slic/utils/__init__.py index 4ace9d377..0108ac329 100644 --- a/slic/utils/__init__.py +++ b/slic/utils/__init__.py @@ -7,7 +7,7 @@ from .elog import Elog from .eval import arithmetic_eval from .exceptions import ChainedException, printable_exception, printed_exception from .ipy import devices -from .json import json_save, json_load +from .json import json_save, json_load, json_validate from .marker import Marker, markers from .npy import nice_linspace, nice_arange, fraction_to_percentage, within, within_fraction, get_dtype, get_shape, is_array from .path import can_create_all_files, can_create_file, glob_files, make_missing_dir