diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref index ac1b8a218968478cc6f8edfd5c7a9eac78d6e1c9..ef5992c1e9b038b7b8c195bf3d8f3ae95700ef2d 100644 --- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref +++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref @@ -1,14 +1,18 @@ Willing to acquire file bootstrap.pkl from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/share/bootstrap.pkl copy bootstrap.pkl -... Read 2 items from python pickle file: bootstrap.pkl -... Read 2 items from python pickle file: bootstrap_test.pkl +... Read defaultdict from bootstrap.pkl +... Read 27 items from python pickle file: bootstrap.pkl +... Read defaultdict from bootstrap_test.pkl +... Read 27 items from python pickle file: bootstrap_test.pkl Step 1: reference file #components: 27 Step 2: file to check #components: 27 Willing to acquire file bootstrap_threaded.pkl from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/share/bootstrap_threaded.pkl copy bootstrap_threaded.pkl -... Read 2 items from python pickle file: bootstrap_threaded.pkl -... Read 2 items from python pickle file: bootstrap_threaded_test.pkl +... Read defaultdict from bootstrap_threaded.pkl +... Read 34 items from python pickle file: bootstrap_threaded.pkl +... Read defaultdict from bootstrap_threaded_test.pkl +... Read 34 items from python pickle file: bootstrap_threaded_test.pkl Step 1: reference file #components: 34 Step 2: file to check #components: 34 diff --git a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py index f2a1726e98a4c1b64336d8518282af04e1d2e1db..429829752a6e501fbd85c77abbae2fed6c893e31 100755 --- a/Control/AthenaConfiguration/python/iconfTool/models/loaders.py +++ b/Control/AthenaConfiguration/python/iconfTool/models/loaders.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration import pickle import logging @@ -85,6 +85,8 @@ def loadConfigFile(fname, args) -> Dict: cfg, (collections.defaultdict, dict) ): # old configuration conf.update(cfg) + conf.update(pickle.load(input_file)) # special services + # FIXME: there's a third pickle object with python components elif isinstance(cfg, (collections.Sequence)): for c in cfg: conf.update(c)