From 4bffacbda655c7194f2ddeae36a78bbf47548048 Mon Sep 17 00:00:00 2001
From: Michal Leszczynski <michal.leszczynski@cern.ch>
Date: Fri, 24 Jul 2020 11:30:25 +0000
Subject: [PATCH] Fix confTool.py imports
---
Control/AthenaConfiguration/{share => python}/new_confTool.py | 0
Control/AthenaConfiguration/{share => python}/old_confTool.py | 1 -
Control/AthenaConfiguration/share/confTool.py | 4 ++--
3 files changed, 2 insertions(+), 3 deletions(-)
rename Control/AthenaConfiguration/{share => python}/new_confTool.py (100%)
rename Control/AthenaConfiguration/{share => python}/old_confTool.py (99%)
diff --git a/Control/AthenaConfiguration/share/new_confTool.py b/Control/AthenaConfiguration/python/new_confTool.py
similarity index 100%
rename from Control/AthenaConfiguration/share/new_confTool.py
rename to Control/AthenaConfiguration/python/new_confTool.py
diff --git a/Control/AthenaConfiguration/share/old_confTool.py b/Control/AthenaConfiguration/python/old_confTool.py
similarity index 99%
rename from Control/AthenaConfiguration/share/old_confTool.py
rename to Control/AthenaConfiguration/python/old_confTool.py
index 8104bfe637b..22b8252d3a9 100644
--- a/Control/AthenaConfiguration/share/old_confTool.py
+++ b/Control/AthenaConfiguration/python/old_confTool.py
@@ -3,7 +3,6 @@
#
from __future__ import print_function
-import argparse
import ast
import collections
import json
diff --git a/Control/AthenaConfiguration/share/confTool.py b/Control/AthenaConfiguration/share/confTool.py
index cfd10954cc0..83ab9a3f545 100755
--- a/Control/AthenaConfiguration/share/confTool.py
+++ b/Control/AthenaConfiguration/share/confTool.py
@@ -63,9 +63,9 @@ def parse_args():
args = parser.parse_args()
if args.newConfig:
- from new_confTool import main
+ from AthenaConfiguration.new_confTool import main
else:
- from old_confTool import main
+ from AthenaConfiguration.old_confTool import main
main(args)
--
GitLab