From 9462a1d2ca120f9722463b2db59d8325ab2a0ee3 Mon Sep 17 00:00:00 2001 From: Sandor Brockhauser Date: Mon, 19 Jun 2023 15:48:06 +0200 Subject: [PATCH] imports --- dev_tools/nyaml2nxdl/comment_collector.py | 2 +- .../nyaml2nxdl/nyaml2nxdl_backward_tools.py | 8 ++++---- .../nyaml2nxdl/nyaml2nxdl_forward_tools.py | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dev_tools/nyaml2nxdl/comment_collector.py b/dev_tools/nyaml2nxdl/comment_collector.py index dcb21021be..0041c14ec4 100644 --- a/dev_tools/nyaml2nxdl/comment_collector.py +++ b/dev_tools/nyaml2nxdl/comment_collector.py @@ -38,7 +38,7 @@ from typing import Type from typing import Union -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import LineLoader +from .nyaml2nxdl_helper import LineLoader __all__ = ["Comment", "CommentCollector", "XMLComment", "YAMLComment"] diff --git a/dev_tools/nyaml2nxdl/nyaml2nxdl_backward_tools.py b/dev_tools/nyaml2nxdl/nyaml2nxdl_backward_tools.py index faa22cc23e..c0f672305a 100755 --- a/dev_tools/nyaml2nxdl/nyaml2nxdl_backward_tools.py +++ b/dev_tools/nyaml2nxdl/nyaml2nxdl_backward_tools.py @@ -27,10 +27,10 @@ from typing import Dict from typing import List -from pynxtools.dataconverter.helpers import remove_namespace_from_tag -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import cleaning_empty_lines -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import get_node_parent_info -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import get_yaml_escape_char_dict +from .nyaml2nxdl_helper import remove_namespace_from_tag +from .nyaml2nxdl_helper import cleaning_empty_lines +from .nyaml2nxdl_helper import get_node_parent_info +from .nyaml2nxdl_helper import get_yaml_escape_char_dict DEPTH_SIZE = " " CMNT_TAG = "!--" diff --git a/dev_tools/nyaml2nxdl/nyaml2nxdl_forward_tools.py b/dev_tools/nyaml2nxdl/nyaml2nxdl_forward_tools.py index 56a33a453c..85b3ece550 100644 --- a/dev_tools/nyaml2nxdl/nyaml2nxdl_forward_tools.py +++ b/dev_tools/nyaml2nxdl/nyaml2nxdl_forward_tools.py @@ -28,13 +28,13 @@ from xml.dom import minidom import yaml -from pynxtools.dataconverter.helpers import remove_namespace_from_tag -from pynxtools.nexus import nexus -from pynxtools.nyaml2nxdl.comment_collector import CommentCollector -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import LineLoader -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import cleaning_empty_lines -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import get_yaml_escape_char_reverter_dict -from pynxtools.nyaml2nxdl.nyaml2nxdl_helper import nx_name_type_resolving +from .nyaml2nxdl_helper import remove_namespace_from_tag +from ..utils import nexus as pynxtools_nxlib +from .nyaml2nxdl.comment_collector import CommentCollector +from .nyaml2nxdl_helper import LineLoader +from .nyaml2nxdl_helper import cleaning_empty_lines +from .nyaml2nxdl_helper import get_yaml_escape_char_reverter_dict +from .nyaml2nxdl_helper import nx_name_type_resolving # pylint: disable=too-many-lines, global-statement, invalid-name DOM_COMMENT = ( @@ -59,13 +59,13 @@ "#\n" "# For further information, see http://www.nexusformat.org\n" ) -NX_CLSS = nexus.get_nx_classes() +NX_CLSS = pynxtools_nxlib.get_nx_classes() NX_NEW_DEFINED_CLASSES = ["NX_COMPLEX"] -NX_TYPE_KEYS = nexus.get_nx_attribute_type() +NX_TYPE_KEYS = pynxtools_nxlib.get_nx_attribute_type() NX_ATTR_IDNT = "\\@" NX_UNIT_IDNT = "unit" DEPTH_SIZE = " " -NX_UNIT_TYPES = nexus.get_nx_units() +NX_UNIT_TYPES = pynxtools_nxlib.get_nx_units() COMMENT_BLOCKS: CommentCollector CATEGORY = "" # Definition would be either 'base' or 'application'