From 95bb57dcdf292a38611e7c7da0ce48ffd72468ce Mon Sep 17 00:00:00 2001 From: Michal Leszczynski <michal.leszczynski@cern.ch> Date: Thu, 26 Nov 2020 10:46:31 +0100 Subject: [PATCH] Fix iconfTool imports --- .../python/iconfTool/gui/pad.py | 7 +++++-- .../python/iconfTool/gui/wrappers.py | 15 +++++++++++---- .../python/iconfTool/models/loaders.py | 7 +++++-- .../python/iconfTool/models/structure.py | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/pad.py b/Control/AthenaConfiguration/python/iconfTool/gui/pad.py index 15cb2d9d977..a51659ffd6d 100755 --- a/Control/AthenaConfiguration/python/iconfTool/gui/pad.py +++ b/Control/AthenaConfiguration/python/iconfTool/gui/pad.py @@ -5,8 +5,11 @@ import logging import sys from typing import Dict, List, Set, Tuple -from models.element import Element, GroupingElement -from models.structure import ComponentsStructure +from AthenaConfiguration.iconfTool.models.element import ( + Element, + GroupingElement, +) +from AthenaConfiguration.iconfTool.models.structure import ComponentsStructure logger = logging.getLogger(__name__) diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py b/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py index 9dca20ae97b..84611f2ce9d 100755 --- a/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py +++ b/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py @@ -4,10 +4,17 @@ import curses import logging from typing import Any, Tuple -from gui.modals import DoubleHelpModal, SearchModal, SingleHelpModal -from gui.pad import Pad -from models.loaders import ComponentsDiffFileLoader, ComponentsFileLoader -from models.structure import ComponentsStructure +from AthenaConfiguration.iconfTool.gui.modals import ( + DoubleHelpModal, + SearchModal, + SingleHelpModal, +) +from AthenaConfiguration.iconfTool.gui.pad import Pad +from AthenaConfiguration.iconfTool.models.loaders import ( + ComponentsDiffFileLoader, + ComponentsFileLoader, +) +from AthenaConfiguration.iconfTool.models.structure import ComponentsStructure logger = logging.getLogger(__name__) diff --git a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py index 7b390ac5eb1..22002d399f7 100755 --- a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py +++ b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py @@ -4,8 +4,11 @@ import pickle import logging from typing import Dict, List, Set, Tuple, cast -from models.element import Element, GroupingElement -from models.structure import ComponentsStructure +from AthenaConfiguration.iconfTool.models.element import ( + Element, + GroupingElement, +) +from AthenaConfiguration.iconfTool.models.structure import ComponentsStructure logger = logging.getLogger(__name__) diff --git a/Control/AthenaConfiguration/python/iconfTool/models/structure.py b/Control/AthenaConfiguration/python/iconfTool/models/structure.py index 897f2c5b644..dbaed1e0b99 100755 --- a/Control/AthenaConfiguration/python/iconfTool/models/structure.py +++ b/Control/AthenaConfiguration/python/iconfTool/models/structure.py @@ -4,7 +4,7 @@ import ast import logging from typing import Callable, Dict, List, Sequence, Set, Tuple -from models.element import ( +from AthenaConfiguration.iconfTool.models.element import ( Element, SingleElement, GroupingElement, -- GitLab