RE #27722 Remove uses of itervalues imported from six

Testing/SystemTests/scripts/runSystemTests.py

@@ -11,7 +11,6 @@ import sys
 import time
 from multiprocessing import Process, Array, Manager, Value, Lock
 
-from six import itervalues
 try:
     # If any tests happen to hit a PyQt4 import make sure item uses version 2 of the api
     # Remove this when everything is switched to qtpy
@@ -324,7 +323,7 @@ def main():
     if options.dry_run:
         print()
         print("Tests that would be executed:")
-        for suites in itervalues(test_list):
+        for suites in test_list.values():
             for suite in suites:
                 print('  ' + suite.name)
     elif not options.clean:

docs/sphinxext/mantiddoc/directives/categories.py

@@ -16,7 +16,6 @@ from mantiddoc.directives.base import AlgorithmBaseDirective, algorithm_name_and
 from sphinx.util.osutil import relative_uri
 import os
 import posixpath
-from six import itervalues
 
 CATEGORY_PAGE_TEMPLATE = "category.html"
 ALG_CATEGORY_PAGE_TEMPLATE = "algorithmcategories.html"
@@ -484,7 +483,7 @@ def purge_categories(app, env, docname):
         return
 
     deadref = PageRef(name, docname)
-    for category in itervalues(categories):
+    for category in categories.values():
         pages = category.pages
         if deadref in pages:
             pages.remove(deadref)

qt/applications/workbench/workbench/plotting/globalfiguremanager.py

@@ -129,7 +129,7 @@ class GlobalFigureManager(object):
     def destroy_fig(cls, fig):
         "*fig* is a Figure instance"
         num = None
-        for manager in six.itervalues(cls.figs):
+        for manager in cls.figs.values():
             if manager.canvas.figure == fig:
                 num = manager.num
                 break

scripts/SANS/sans/gui_logic/models/batch_process_runner.py

@@ -8,7 +8,6 @@ import traceback
 
 import six
 from qtpy.QtCore import Slot, QThreadPool, Signal, QObject
-from six import itervalues
 
 from mantid.kernel import Logger
 from sans.algorithm_detail.batch_execution import load_workspaces_from_states
@@ -73,10 +72,10 @@ class BatchProcessRunner(QObject):
             assert len(states) + len(errors) == 1, \
                 "Expected 1 error to return got {0}".format(len(states) + len(errors))
 
-            for error in itervalues(errors):
+            for error in errors.values():
                 self.row_failed_signal.emit(index, error)
 
-            for state in itervalues(states):
+            for state in states.values():
                 try:
                     out_scale_factors, out_shift_factors = \
                         self.batch_processor([state], use_optimizations, output_mode, plot_results, output_graph, save_can)
@@ -100,10 +99,10 @@ class BatchProcessRunner(QObject):
                 self._handle_err(index, e)
                 continue
 
-            for error in itervalues(errors):
+            for error in errors.values():
                 self.row_failed_signal.emit(index, error)
 
-            for state in itervalues(states):
+            for state in states.values():
                 try:
                     load_workspaces_from_states(state)
                     self.row_processed_signal.emit(index, [], [])

scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py

@@ -11,7 +11,7 @@
 import json
 import copy
 import abc
-from six import with_metaclass, itervalues, add_metaclass
+from six import with_metaclass, add_metaclass
 
 from sans.state.JsonSerializable import JsonSerializable
 from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSInstrument)
@@ -256,7 +256,7 @@ class StateCalculateTransmission(with_metaclass(JsonSerializable)):
                                                     "background_TOF_monitor_stop": self.background_TOF_monitor_stop})
                         is_invalid.update(entry)
 
-        for fit_type in itervalues(self.fit):
+        for fit_type in self.fit.values():
             fit_type.validate()
 
         if is_invalid: