diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt index 2bd8475dcd62251df558d0b0b0010e127fe6ab30..e849dae5f78fe399ae1eb8ecf1962de180139bc9 100644 --- a/Control/AthenaConfiguration/CMakeLists.txt +++ b/Control/AthenaConfiguration/CMakeLists.txt @@ -9,7 +9,7 @@ atlas_subdir( AthenaConfiguration ) # Install files from the package: -atlas_install_python_modules( python/*.py ) +atlas_install_python_modules( python/*.py python/iconfTool ) atlas_install_runtime(python/*.pkl ) atlas_install_scripts( share/confTool.py python/iconfTool/iconfTool ) diff --git a/Control/AthenaConfiguration/python/iconfTool/__init__.py b/Control/AthenaConfiguration/python/iconfTool/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py b/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py index 4909846834d603e87c38981f55d9de37165b831f..2e655fd633e7f208af49b2a5d26234993eb7b8cd 100644 --- a/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py +++ b/Control/AthenaConfiguration/python/iconfTool/gui/wrappers.py @@ -6,8 +6,8 @@ import curses import logging -from gui.modals import SearchModal -from gui.pad import Pad +from AthenaConfiguration.iconfTool.gui.modals import SearchModal +from AthenaConfiguration.iconfTool.gui.pad import Pad logger = logging.getLogger('iconfTool.' + __name__) diff --git a/Control/AthenaConfiguration/python/iconfTool/iconfTool b/Control/AthenaConfiguration/python/iconfTool/iconfTool index e9eb6550328bda7232551dd21ae4c6f50a9a2516..256e02866b6cc8b72285892037a5ff37a461e65c 100755 --- a/Control/AthenaConfiguration/python/iconfTool/iconfTool +++ b/Control/AthenaConfiguration/python/iconfTool/iconfTool @@ -8,7 +8,7 @@ import logging # Logging configuration -logging_file = 'run.log' +logging_file = 'iconfTool.log' # Creating or cleaning log file with open(logging_file, 'w'): pass @@ -22,9 +22,9 @@ logger.setLevel(logging.DEBUG) logger.addHandler(handler) -from gui.wrappers import GuiLoader, DoublePad -from models.loaders import ComponentsFileLoader, ComponentsDiffFileLoader -from utils import serialization +from AthenaConfiguration.iconfTool.gui.wrappers import GuiLoader, DoublePad +from AthenaConfiguration.iconfTool.models.loaders import ComponentsFileLoader, ComponentsDiffFileLoader +from AthenaConfiguration.iconfTool.utils import serialization if __name__ == '__main__': diff --git a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py index 5cafc52f3c7fc23a669af75a7a64390e1540b609..38afebba0468a4492df9677d4a27ee57aea61f76 100644 --- a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py +++ b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py @@ -6,7 +6,7 @@ import pickle import logging -from models.structure import ComponentsStructure +from AthenaConfiguration.iconfTool.models.structure import ComponentsStructure logger = logging.getLogger('iconfTool.' + __name__) diff --git a/Control/AthenaConfiguration/python/iconfTool/models/structure.py b/Control/AthenaConfiguration/python/iconfTool/models/structure.py index 15af721498a5a479419094941bf30933a129bdb0..bc6bb878d1d9ea4ac5aa60baaae6a0d9296ed4a2 100644 --- a/Control/AthenaConfiguration/python/iconfTool/models/structure.py +++ b/Control/AthenaConfiguration/python/iconfTool/models/structure.py @@ -8,7 +8,7 @@ import copy import sys import logging -from models.element import SingleElement, GroupingElement, ValueElement +from AthenaConfiguration.iconfTool.models.element import SingleElement, GroupingElement, ValueElement logger = logging.getLogger('iconfTool.' + __name__) INDENT = 3