diff --git a/scripts/Inelastic/CrystalField/fitting.py b/scripts/Inelastic/CrystalField/fitting.py
index 4f2550068410858632408e6b06deeaec33bdfb29..91084436749e13dfa40450c725c606fa0d23e3f7 100644
--- a/scripts/Inelastic/CrystalField/fitting.py
+++ b/scripts/Inelastic/CrystalField/fitting.py
@@ -168,7 +168,7 @@ class CrystalField(object):
temperature = self._getTemperature(i)
out = 'name=CrystalFieldPeaks,Ion=%s,Symmetry=%s,Temperature=%s' % (self._ion, self._symmetry, temperature)
out += ',ToleranceEnergy=%s,ToleranceIntensity=%s' % (self._toleranceEnergy, self._toleranceIntensity)
- out += ',%s' % ','.join(['%s=%s' % item for item in list(self._fieldParameters.items())])
+ out += ',%s' % ','.join(['%s=%s' % item for item in self._fieldParameters.items()])
return out
def makeSpectrumFunction(self, i=0):
@@ -182,7 +182,7 @@ class CrystalField(object):
out += ',PeakShape=%s' % self.getPeak(i).name
if self._FWHM is not None:
out += ',FWHM=%s' % self._getFWHM(i)
- out += ',%s' % ','.join(['%s=%s' % item for item in list(self._fieldParameters.items())])
+ out += ',%s' % ','.join(['%s=%s' % item for item in self._fieldParameters.items()])
peaks = self.getPeak(i)
params = peaks.paramString('', 0)
if len(params) > 0:
@@ -218,7 +218,7 @@ class CrystalField(object):
out += ',Temperatures=(%s)' % ','.join(map(str, self._temperature))
if self._FWHM is not None:
out += ',FWHMs=(%s)' % ','.join(map(str, self._FWHM))
- out += ',%s' % ','.join(['%s=%s' % item for item in list(self._fieldParameters.items())])
+ out += ',%s' % ','.join(['%s=%s' % item for item in self._fieldParameters.items()])
tieList = []
constraintsList = []
@@ -530,7 +530,7 @@ class CrystalField(object):
self._fieldTies[name] = '0'
def getFieldTies(self):
- ties = ['%s=%s' % item for item in list(self._fieldTies.items())]
+ ties = ['%s=%s' % item for item in self._fieldTies.items()]
return ','.join(ties)
def getFieldConstraints(self):
@@ -741,7 +741,7 @@ class CrystalFieldMulti(object):
self._ties[tie] = kwargs[tie]
def getTies(self):
- ties = ['%s=%s' % item for item in list(self._ties.items())]
+ ties = ['%s=%s' % item for item in self._ties.items()]
return ','.join(ties)
def getSpectrum(self, i=0, workspace=None, ws_index=0):
diff --git a/scripts/Inelastic/CrystalField/function.py b/scripts/Inelastic/CrystalField/function.py
index 4a08809e300de0c75e340a03de461ad15aa9b099..aea9c21e3471cbc5d6024eea3ffdd1751923fc7d 100644
--- a/scripts/Inelastic/CrystalField/function.py
+++ b/scripts/Inelastic/CrystalField/function.py
@@ -76,13 +76,13 @@ class Function(object):
def toString(self):
"""Create function initialisation string"""
- attrib = ['%s=%s' % item for item in list(self._attrib.items())] + \
- ['%s=%s' % item for item in list(self._params.items())]
+ attrib = ['%s=%s' % item for item in self._attrib.items()] + \
+ ['%s=%s' % item for item in self._params.items()]
if len(attrib) > 0:
out = 'name=%s,%s' % (self._name, ','.join(attrib))
else:
out = 'name=%s' % self._name
- ties = ','.join(['%s=%s' % item for item in list(self._ties.items())])
+ ties = ','.join(['%s=%s' % item for item in self._ties.items()])
if len(ties) > 0:
out += ',ties=(%s)' % ties
constraints = ','.join(self._constraints)
@@ -94,15 +94,15 @@ class Function(object):
"""Create a string with only parameters and attributes settings.
The prefix is prepended to all attribute names.
"""
- attrib = ['%s%s=%s' % ((prefix,) + item) for item in list(self._attrib.items())] + \
- ['%s%s=%s' % ((prefix,) + item) for item in list(self._params.items())]
+ attrib = ['%s%s=%s' % ((prefix,) + item) for item in self._attrib.items()] + \
+ ['%s%s=%s' % ((prefix,) + item) for item in self._params.items()]
return ','.join(attrib)
def tiesString(self, prefix):
"""Create a string with only ties settings.
The prefix is prepended to all parameter names.
"""
- ties = ['%s%s=%s' % ((prefix,) + item) for item in list(self._ties.items())]
+ ties = ['%s%s=%s' % ((prefix,) + item) for item in self._ties.items()]
return ','.join(ties)
def constraintsString(self, prefix):
diff --git a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
index 42f126272dc20c54c057cda3baf7337240b14147..cb0e622476ba439a44369b7fb85c4159d2d24881 100644
--- a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
+++ b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
@@ -790,7 +790,7 @@ class MantidConfigDirectInelastic(object):
# define and append user scripts search path
user_path_part = copy.deepcopy(self._python_user_scripts)
# pylint: disable=W0212
- for instr in list(self._user._instrument.values()):
+ for instr in self._user._instrument.values():
user_path_part.add(os.path.join('direct_inelastic', instr.upper()))
for part in user_path_part:
path += ';' + os.path.join(self._script_repo, part) + '/'
@@ -962,5 +962,5 @@ if __name__ == "__main__":
# Configure user
mcf.init_user(user.userID, user)
mcf.generate_config()
- print("Successfully Configured user: {0} for instrument {1} and RBNum: {2}" \
- .format(user.userID, user.instrument, user.rb_folder))
+ print("Successfully Configured user: {0} for instrument {1} and RBNum: {2}"
+ .format(user.userID, user.instrument, user.rb_folder))
diff --git a/scripts/Inelastic/Direct/PropertyManager.py b/scripts/Inelastic/Direct/PropertyManager.py
index 9ec45beaf72bb79b79350d1fe6e1d0dd8b635476..eddd34e8adc42242c864a89fee64fba8b7ef78ae 100644
--- a/scripts/Inelastic/Direct/PropertyManager.py
+++ b/scripts/Inelastic/Direct/PropertyManager.py
@@ -283,7 +283,7 @@ class PropertyManager(NonIDF_Properties):
with some parameters missing.
"""
- for par_name,value in list(kwargs.items()) :
+ for par_name,value in kwargs.items() :
if value is not None:
setattr(self,par_name,value)
#
diff --git a/scripts/Inelastic/Direct/ReductionHelpers.py b/scripts/Inelastic/Direct/ReductionHelpers.py
index 290f4a7052d6ea5ba8a5ea18bdeab7fb25fbb97a..de58a85f0188d6860ba9753c288071ca9527b00e 100644
--- a/scripts/Inelastic/Direct/ReductionHelpers.py
+++ b/scripts/Inelastic/Direct/ReductionHelpers.py
@@ -149,7 +149,7 @@ def build_properties_dict(param_map,synonims,descr_list=[]) :
properties_dict = dict()
descr_dict = dict()
- for name,val in list(param_map.items()) :
+ for name,val in param_map.items() :
if name in synonims:
final_name = str(synonims[name])
else:
diff --git a/scripts/Inelastic/Direct/diagnostics.py b/scripts/Inelastic/Direct/diagnostics.py
index 7392249f0d332fcd4d62136fc8dad23272b14346..0916cdd231a60bab54baddc1713c8e8c2ef38b2a 100644
--- a/scripts/Inelastic/Direct/diagnostics.py
+++ b/scripts/Inelastic/Direct/diagnostics.py
@@ -17,7 +17,7 @@ from mantid.kernel.funcinspect import lhs_info
import os
import Direct.RunDescriptor as RunDescriptor
from Direct.PropertyManager import PropertyManager
-from six import itertools
+from six import iteritems
# Reference to reducer used if necessary for working with run descriptors (in diagnostics)
__Reducer__ = None
diff --git a/scripts/SANS/SANSBatchMode.py b/scripts/SANS/SANSBatchMode.py
index 50d2533c572917264f37c4630e6a49d7143cca84..e04be8e948dcb2285fff3ff13167ffae4a204e2a 100644
--- a/scripts/SANS/SANSBatchMode.py
+++ b/scripts/SANS/SANSBatchMode.py
@@ -119,7 +119,7 @@ def addRunToStore(parts, run_store):
#move through the file like sample_sans,99630,output_as,99630, ...
for i in range(0, nparts, 2):
role = parts[i]
- if role in list(inputdata.keys()):
+ if role in inputdata.keys():
inputdata[parts[i]] = parts[i+1]
else:
issueWarning('You seem to have specified an invalid key in the SANSBatch file. The key was ' + str(role))
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index 27c0f042c74f94a96e4e9047a3724988fa2ab48a..2a8c958d263806ab1e67601ecda3eb30fdb24af0 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -1846,7 +1846,7 @@ def parseLogFile(logfile):
file_log = open(logfile, 'rU')
for line in file_log:
entry = line.split()[1]
- if entry in list(logkeywords.keys()):
+ if entry in logkeywords.keys():
logkeywords[entry] = float(line.split()[2])
return tuple(logkeywords.values())
diff --git a/scripts/SANS/isis_instrument.py b/scripts/SANS/isis_instrument.py
index 9153e0b28028ab444e2f15cd914ae06d4040556c..d2cdde2b12fe7e174f43cd5b66a2bdfdb1ec8a9a 100644
--- a/scripts/SANS/isis_instrument.py
+++ b/scripts/SANS/isis_instrument.py
@@ -337,7 +337,7 @@ class DetectorBank(object):
@param guess: this name will be searched for in the list
@return : True if the name was found, otherwise false
"""
- for name in list(self._names.values()):
+ for name in self._names.values():
if guess.lower() == name.lower():
return True
return False
diff --git a/scripts/SANS/isis_reduction_steps.py b/scripts/SANS/isis_reduction_steps.py
index ac87dca33e980964e87cbcbcdedd6eed0192ecf8..00c764607077b8950b1cb60bcc3bfa421581d327 100644
--- a/scripts/SANS/isis_reduction_steps.py
+++ b/scripts/SANS/isis_reduction_steps.py
@@ -2053,7 +2053,7 @@ class TransmissionCalc(ReductionStep):
order_str = fit_method[10:]
fit_method = 'POLYNOMIAL'
self.fit_settings[select + ORDER] = int(order_str)
- if fit_method not in list(self.TRANS_FIT_OPTIONS.keys()):
+ if fit_method not in self.TRANS_FIT_OPTIONS.keys():
_issueWarning(
'ISISReductionStep.Transmission: Invalid fit mode passed to TransFit, using default method (%s)' % self.DEFAULT_FIT)
fit_method = self.DEFAULT_FIT
@@ -2341,7 +2341,7 @@ class TransmissionCalc(ReductionStep):
calc_trans_alg.setProperty("IncidentBeamMonitor", pre_sample)
calc_trans_alg.setProperty("RebinParams", reducer.to_wavelen.get_rebin())
calc_trans_alg.setProperty("OutputUnfittedData", True)
- for name, value in list(options.items()):
+ for name, value in options.items():
calc_trans_alg.setProperty(name, value)
if self.trans_mon:
@@ -3254,7 +3254,7 @@ class UserFile(ReductionStep):
upper_line = line.upper()
# check for a recognised command
- for keyword in list(self.key_functions.keys()):
+ for keyword in self.key_functions.keys():
if upper_line.startswith(keyword):
# remove the keyword as it has already been parsed
params = line[len(keyword):]
diff --git a/scripts/SANS/reduction_settings.py b/scripts/SANS/reduction_settings.py
index 185794615c7527a9ca58da6fb1ba08db49b73aec..c75d22107a1707b90776ee9de536a499fbe5817b 100644
--- a/scripts/SANS/reduction_settings.py
+++ b/scripts/SANS/reduction_settings.py
@@ -141,7 +141,7 @@ def get_settings_object(settings_prop_man_name=REDUCTION_SETTINGS_OBJ_NAME):
new_prop_man = PropertyManagerPicklableWrapper(new_name)
new_prop_man.clear()
- for key, value in list(self.items()):
+ for key, value in self.items():
new_prop_man[key] = value
return new_prop_man
diff --git a/scripts/test/DirectReductionHelpersTest.py b/scripts/test/DirectReductionHelpersTest.py
index 02aae2a433cf4928d819c233f6313564bc86b191..0b975d9e5585d21f67bfbd865ba11d1da28c484c 100644
--- a/scripts/test/DirectReductionHelpersTest.py
+++ b/scripts/test/DirectReductionHelpersTest.py
@@ -136,7 +136,7 @@ class DirectReductionHelpersTest(unittest.TestCase):
self.assertEqual(len(desct),3)
self.assertEqual(desct['descr3'],10)
self.assertEqual(desct['descr1'],'ddd')
- self.assertTrue('des222' in list(desct.keys()))
+ self.assertTrue('des222' in desct.keys())
self.assertEqual(len(prop_dict),6)