diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 33c34e346fe982b2e748618c235b08dfdd3cbd82..3dc09335320267828ffc3f67393944a8520330c4 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -1009,7 +1009,7 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
if existingConfigurable: # if configurable exists we try to merge with it
_log.debug( "{}Pre-existing configurable {} was found, checking if has the same properties".format( indent, comp.getName() ) )
__areSettingsSame( existingConfigurable, comp )
- _log.debug( "{}Pre-existing configurable was found to have the same properties".format( indent, comp.name ) )
+ _log.debug( "{}Pre-existing configurable {} was found to have the same properties".format( indent, comp.name ) )
instance = existingConfigurable if not suppressDupes else None
else: # create new configurable
_log.debug( "{}Creating component configurable {}".format( indent, comp.getFullJobOptName() ) )
diff --git a/Tools/PyJobTransforms/python/trfExe.py b/Tools/PyJobTransforms/python/trfExe.py
index a4544e53e31474c93f32dcaf4b0d75ccaf51a152..a8ed671c0ac7b789ec9774b784070fb958d7d021 100755
--- a/Tools/PyJobTransforms/python/trfExe.py
+++ b/Tools/PyJobTransforms/python/trfExe.py
@@ -15,7 +15,6 @@ from builtins import int
# @brief Transform execution functions
# @details Standard transform executors
# @author atlas-comp-transforms-dev@cern.ch
-# @version $Id: trfExe.py 792052 2017-01-13 13:36:51Z mavogel $
import copy
import json
@@ -1377,7 +1376,7 @@ class athenaExecutor(scriptExecutor):
self._dbsetup = dbsetup
self._wrapperFile = 'runwrapper.{name}.sh'.format(name = self._name)
msg.debug(
- 'Preparing wrapper file {wrapperFileName} with ' +
+ 'Preparing wrapper file {wrapperFileName} with '
'asetup={asetupStatus} and dbsetup={dbsetupStatus}'.format(
wrapperFileName = self._wrapperFile,
asetupStatus = self._asetup,
diff --git a/Tools/PyJobTransforms/python/trfUtils.py b/Tools/PyJobTransforms/python/trfUtils.py
index 6bb8596ddcfc52863f256caa0e8ecfaae9ca2894..ad8f656a502c335011fd572ea270408ceae9beaf 100644
--- a/Tools/PyJobTransforms/python/trfUtils.py
+++ b/Tools/PyJobTransforms/python/trfUtils.py
@@ -11,7 +11,6 @@ import six
## @package PyJobTransforms.trfUtils
# @brief Transform utility functions
# @author atlas-comp-transforms-dev@cern.ch
-# @version $Id: trfUtils.py 785618 2016-11-21 22:03:04Z uworlika $
import os
import os.path as path
@@ -1082,7 +1081,7 @@ class ParallelJobProcessor(object):
timeStampComplete = self.jobSubmission.timeStampComplete
))
self.jobSubmission.processingTime = self.jobSubmission.timeStampComplete - self.jobSubmission.timeStampSubmission
- msg.debug("{notifier}: time taken to process all {units}: {processingTime}".format(
+ msg.debug("{notifier}: time taken to process all {countOfJobs} {units}: {processingTime}".format(
notifier = self.className,
countOfJobs = self.countOfJobs,
units = units(
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
index bdb5bf6a2f78a960fb8e9079ea2a154447dce482..778c3355f7a94bb4e4548297652b28c0f4c98c5e 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
@@ -167,7 +167,7 @@ class Step(object):
elif self.output_stream == self.OutputStream.FILE_AND_STDOUT:
cmd += ' 2>&1 | tee {}; exit ${{PIPESTATUS[0]}}'.format(self.get_log_file_name())
elif self.output_stream == self.OutputStream.STDOUT_ONLY:
- cmd += ' 2>&1'.format(self.name)
+ cmd += ' 2>&1'
self.log.info('Running %s step using command:\n%s', self.name, cmd)
if dry_run:
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
index 9edb3268b47006bcdf479f4c21aeebd0e2e1f762..b262edae26d8511d6d7f9b0a1960e5db4dcba0ab 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
@@ -129,7 +129,7 @@ class Test(object):
if previous_code != 0 and step.depends_on_previous:
self.log.error('Skipping step %s because previous step(s) failed', step.name)
step.result = 1
- code, cmd = step.result, '# Skipped %s because of earlier failure'.format(step.name)
+ code, cmd = step.result, '# Skipped {} because of earlier failure'.format(step.name)
if step.auto_report_result:
step.report_result()
continue
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index 958c933a3c3201cc7b45a42a3d149c6a5b25235c..aa95c6efc07cf9987085dc84be1b5bb0b6b3d489 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# ********************* All Tools/Functions for the TriggerEDM **********************
@@ -24,7 +24,7 @@ import six
#************************************************************
# Let adding collections via preExec for detailed validation
if flags.Trigger.ExtraEDMList:
- log.info( "Adding extra collections to EDM (): {}".format(len(TriggerHLTListRun3), flags.Trigger.ExtraEDMList) )
+ log.info( "Adding {} extra collections to EDM (): {}".format(len(TriggerHLTListRun3), flags.Trigger.ExtraEDMList) )
addExtraCollectionsToEDMList(TriggerHLTListRun3, flags.Trigger.ExtraEDMList)
log.info( "Number of EDM items after adding extra collections: {}".format(len(TriggerHLTListRun3)) )