From dbb8117f0f7f0417c0811b909ff9efbd51363c69 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 13:12:57 +0000
Subject: [PATCH 01/37] RE #27722 Remove future statements without brackets
---
Framework/PythonInterface/mantid/api/__init__.py | 2 --
Framework/PythonInterface/mantid/api/_aliases.py | 2 --
Framework/PythonInterface/mantid/dataobjects/__init__.py | 2 --
Framework/PythonInterface/mantid/geometry/__init__.py | 2 --
Framework/PythonInterface/mantid/kernel/__init__.py | 2 --
Framework/PythonInterface/mantid/plots/mantidaxes.py | 2 --
.../PythonInterface/mantid/plots/modest_image/modest_image.py | 2 --
Framework/PythonInterface/mantid/plots/plotfunctions.py | 2 --
Framework/PythonInterface/mantid/plots/utility.py | 2 --
Framework/PythonInterface/mantid/py3compat/enum.py | 2 --
Framework/PythonInterface/mantid/py3compat/mock.py | 2 --
.../plugins/algorithms/ApplyDetectorScanEffCorr.py | 2 --
.../plugins/algorithms/CalculateEfficiencyCorrection.py | 1 -
.../PythonInterface/plugins/algorithms/FitIncidentSpectrum.py | 1 -
.../plugins/algorithms/OrderWorkspaceHistory.py | 2 --
Framework/PythonInterface/plugins/algorithms/SaveYDA.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/LoadWAND.py | 1 -
.../algorithms/WorkflowAlgorithms/WANDPowderReduction.py | 1 -
.../PythonInterface/test/python/mantid/plots/UtilityTest.py | 2 --
.../test/python/mantid/plots/compatabilityTest.py | 2 --
.../test/python/mantid/plots/modest_image/test_imshow.py | 1 -
.../test/python/mantid/plots/modest_image/test_modest_image.py | 1 -
.../test/python/mantid/plots/modest_image/test_speed.py | 1 -
.../test/python/mantid/plots/plotfunctionsTest.py | 2 --
.../test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py | 1 -
.../test/python/plugins/algorithms/HB2AReduceTest.py | 1 -
.../test/python/plugins/algorithms/LoadWANDSCDTest.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py | 1 -
.../algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py | 1 -
.../test/testhelpers/WorkspaceCreationHelper/__init__.py | 2 --
MantidPlot/test/MantidPlotMatplotlibTest.py | 2 --
Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py | 1 -
Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py | 1 -
Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py | 2 --
buildconfig/CMake/FindPyQt.py | 2 --
qt/applications/workbench/workbench/config/test/test_user.py | 2 --
qt/applications/workbench/workbench/plotting/figurewindow.py | 2 --
.../workbench/workbench/plotting/globalfiguremanager.py | 2 --
.../workbench/workbench/plotting/test/test_utility.py | 2 --
qt/applications/workbench/workbench/plugins/base.py | 2 --
.../workbench/workbench/plugins/exception_handler/__init__.py | 2 --
.../workbench/plugins/exception_handler/error_messagebox.py | 2 --
.../workbench/workbench/plugins/test/test_exception_handler.py | 2 --
qt/applications/workbench/workbench/requirements.py | 2 --
.../workbench/workbench/widgets/plotselector/model.py | 2 --
.../workbench/workbench/widgets/plotselector/presenter.py | 2 --
.../widgets/plotselector/test/test_plotselector_model.py | 2 --
.../widgets/plotselector/test/test_plotselector_presenter.py | 2 --
.../widgets/plotselector/test/test_plotselector_view.py | 2 --
.../workbench/workbench/widgets/plotselector/view.py | 2 --
.../workbench/widgets/settings/categories/presenter.py | 2 --
.../settings/categories/test/test_categories_settings.py | 2 --
.../workbench/workbench/widgets/settings/categories/view.py | 2 --
.../workbench/workbench/widgets/settings/fitting/presenter.py | 2 --
.../widgets/settings/fitting/test/test_fitting_settings.py | 2 --
.../workbench/workbench/widgets/settings/fitting/view.py | 2 --
.../workbench/workbench/widgets/settings/general/presenter.py | 2 --
.../widgets/settings/general/test/test_general_settings.py | 2 --
.../workbench/workbench/widgets/settings/general/view.py | 2 --
.../workbench/workbench/widgets/settings/plots/presenter.py | 2 --
.../widgets/settings/plots/test/test_plot_settings.py | 2 --
.../workbench/workbench/widgets/settings/plots/view.py | 2 --
.../workbench/widgets/settings/test/test_settings_presenter.py | 2 --
.../workbench/widgets/settings/test/test_settings_view.py | 2 --
qt/applications/workbench/workbench/widgets/settings/view.py | 2 --
qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py | 2 --
qt/python/mantidqt/plotting/figuretype.py | 2 --
qt/python/mantidqt/plotting/test/test_functions.py | 2 --
qt/python/mantidqt/plotting/test/test_tiledplots.py | 2 --
qt/python/mantidqt/test/test_algorithm_observer.py | 1 -
qt/python/mantidqt/utils/qt/__init__.py | 2 --
qt/python/mantidqt/utils/qt/testing/__init__.py | 2 --
qt/python/mantidqt/utils/qt/testing/application.py | 2 --
qt/python/mantidqt/utils/qt/testing/gui_test_runner.py | 2 --
qt/python/mantidqt/utils/qt/testing/gui_window_test.py | 1 -
qt/python/mantidqt/utils/qt/testing/modal_tester.py | 2 --
qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py | 2 --
qt/python/mantidqt/utils/show_in_explorer.py | 2 --
qt/python/mantidqt/utils/test/test_async.py | 2 --
qt/python/mantidqt/utils/testing/__init__.py | 1 -
qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py | 2 --
qt/python/mantidqt/utils/testing/strict_mock.py | 2 --
.../widgets/algorithmselector/algorithm_factory_observer.py | 3 ---
qt/python/mantidqt/widgets/algorithmselector/model.py | 2 --
qt/python/mantidqt/widgets/algorithmselector/presenter.py | 2 --
.../mantidqt/widgets/algorithmselector/test/observer_test.py | 2 --
.../widgets/algorithmselector/test/test_algorithmselector.py | 2 --
qt/python/mantidqt/widgets/algorithmselector/widget.py | 2 --
qt/python/mantidqt/widgets/codeeditor/execution.py | 2 --
qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py | 1 -
.../widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py | 2 --
.../widgets/codeeditor/tab_widget/codeeditor_tab_view.py | 2 --
.../mantidqt/widgets/codeeditor/tab_widget/test/__init__.py | 1 -
.../tab_widget/test/test_codeeditor_tab_presenter.py | 2 --
.../codeeditor/tab_widget/test/test_codeeditor_tab_view.py | 2 --
.../widgets/instrumentview/test/test_instrumentview_view.py | 2 --
qt/python/mantidqt/widgets/jupyterconsole.py | 2 --
.../mantidqt/widgets/samplelogs/test/test_samplelogs_view.py | 2 --
.../mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py | 2 --
.../mantidqt/widgets/workspacedisplay/matrix/presenter.py | 2 --
.../matrix/test/test_matrixworkspacedisplay_io.py | 2 --
.../test/test_matrixworkspacedisplay_table_view_model.py | 2 --
.../matrix/test/test_matrixworkspacedisplay_view.py | 2 --
.../mantidqt/widgets/workspacedisplay/table/error_column.py | 3 ---
.../mantidqt/widgets/workspacedisplay/table/marked_columns.py | 3 ---
qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py | 2 --
.../widgets/workspacewidget/test/test_workspacetreewidget.py | 2 --
scripts/BilbyCustomFunctions_Reduction.py | 1 -
scripts/Calibration/Examples/TubeCalibDemoMaps_All.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py | 2 --
.../Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMerlin.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoWish0.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoWish1.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py | 2 --
scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py | 2 --
scripts/Calibration/tube.py | 2 --
scripts/Calibration/tube_calib.py | 2 --
scripts/Calibration/tube_calib_fit_params.py | 3 ---
scripts/Calibration/tube_spec.py | 3 ---
scripts/Elemental_Analysis.py | 2 --
scripts/HFIR_4Circle_Reduction/process_mask.py | 2 --
scripts/Inelastic/dos/__init__.py | 2 --
scripts/Inelastic/vesuvio/__init__.py | 2 --
scripts/Interface/ui/sans_isis/add_runs_page.py | 2 --
scripts/Interface/ui/sans_isis/work_handler.py | 2 --
scripts/MSlice.py | 2 --
scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py | 3 ---
scripts/MultiPlotting/QuickEdit/quickEdit_view.py | 1 -
scripts/MultiPlotting/QuickEdit/quickEdit_widget.py | 2 --
scripts/MultiPlotting/label.py | 3 ---
scripts/MultiPlotting/multi_plotting_context.py | 2 --
scripts/Muon/GUI/Common/load_widget/load_presenter.py | 2 --
scripts/Muon/GUI/Common/load_widget/load_view.py | 2 --
scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py | 2 --
.../ElementalAnalysis/PeriodicTable/periodic_table_model.py | 2 --
.../PeriodicTable/periodic_table_presenter.py | 2 --
.../GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py | 2 --
scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py | 2 --
scripts/plotting_test.py | 2 --
.../test/Muon/elemental_analysis/PeriodicTableModel_test.py | 2 --
.../Muon/elemental_analysis/PeriodicTablePresenter_test.py | 2 --
scripts/test/Muon/elemental_analysis/element_button_test.py | 2 --
.../test/Muon/elemental_analysis/elemental_analysis_test.py | 2 --
scripts/test/Muon/elemental_analysis/load_model_test.py | 2 --
scripts/test/Muon/elemental_analysis/name_generator_test.py | 2 --
scripts/test/Muon/elemental_analysis/peak_data_file_test.py | 1 -
.../test/Muon/elemental_analysis/peak_selector_view_test.py | 2 --
scripts/test/Muon/elemental_analysis/periodic_combo_test.py | 2 --
scripts/test/Muon/elemental_analysis/periodic_list_test.py | 2 --
.../test/Muon/elemental_analysis/periodic_table_item_test.py | 3 ---
scripts/test/Muon/elemental_analysis/periodic_table_test.py | 2 --
tools/reports/display_jenkins_build_queue.py | 2 --
tools/skipped_systemtests.py | 1 -
159 files changed, 303 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/__init__.py b/Framework/PythonInterface/mantid/api/__init__.py
index 0ec0bf31a23..b8ec63ff618 100644
--- a/Framework/PythonInterface/mantid/api/__init__.py
+++ b/Framework/PythonInterface/mantid/api/__init__.py
@@ -11,8 +11,6 @@ api
Defines Python objects that wrap the C++ API namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library
###############################################################################
diff --git a/Framework/PythonInterface/mantid/api/_aliases.py b/Framework/PythonInterface/mantid/api/_aliases.py
index a5ccca32168..274e005b7a7 100644
--- a/Framework/PythonInterface/mantid/api/_aliases.py
+++ b/Framework/PythonInterface/mantid/api/_aliases.py
@@ -7,8 +7,6 @@
"""
Defines a set of aliases to make accessing certain objects easier
"""
-from __future__ import absolute_import
-
from mantid.api import (AlgorithmFactoryImpl, AlgorithmManagerImpl, AnalysisDataServiceImpl, CatalogManagerImpl,
FileFinderImpl, FileLoaderRegistryImpl, FrameworkManagerImpl, FunctionFactoryImpl,
WorkspaceFactoryImpl)
diff --git a/Framework/PythonInterface/mantid/dataobjects/__init__.py b/Framework/PythonInterface/mantid/dataobjects/__init__.py
index 5bd41720c97..28de58bc65e 100644
--- a/Framework/PythonInterface/mantid/dataobjects/__init__.py
+++ b/Framework/PythonInterface/mantid/dataobjects/__init__.py
@@ -19,8 +19,6 @@ downcast to the correct leaf type if the export for that class exists in the reg
The names from the library are not imported by default as it is best if the interface classes
are used for checks such as isinstance()
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library and register the C++ class exports
###############################################################################
diff --git a/Framework/PythonInterface/mantid/geometry/__init__.py b/Framework/PythonInterface/mantid/geometry/__init__.py
index c982060c841..6e20006e045 100644
--- a/Framework/PythonInterface/mantid/geometry/__init__.py
+++ b/Framework/PythonInterface/mantid/geometry/__init__.py
@@ -11,8 +11,6 @@ mantid.geometry
Defines Python objects that wrap the C++ Geometry namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Load the C++ library
###############################################################################
diff --git a/Framework/PythonInterface/mantid/kernel/__init__.py b/Framework/PythonInterface/mantid/kernel/__init__.py
index 888f203deab..47ceca99227 100644
--- a/Framework/PythonInterface/mantid/kernel/__init__.py
+++ b/Framework/PythonInterface/mantid/kernel/__init__.py
@@ -11,8 +11,6 @@ kernel
Defines Python objects that wrap the C++ Kernel namespace.
"""
-from __future__ import absolute_import
-
###############################################################################
# Make modules available in this namespace
###############################################################################
diff --git a/Framework/PythonInterface/mantid/plots/mantidaxes.py b/Framework/PythonInterface/mantid/plots/mantidaxes.py
index a9c7f4482fa..7f529092e65 100644
--- a/Framework/PythonInterface/mantid/plots/mantidaxes.py
+++ b/Framework/PythonInterface/mantid/plots/mantidaxes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
try:
from collections.abc import Iterable
except ImportError:
diff --git a/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py b/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
index 098610c30dd..ca057e8caf2 100644
--- a/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
+++ b/Framework/PythonInterface/mantid/plots/modest_image/modest_image.py
@@ -9,8 +9,6 @@
Modification of Chris Beaumont's mpl-modest-image package to allow the use of
set_extent.
"""
-from __future__ import print_function, division
-
import matplotlib
rcParams = matplotlib.rcParams
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index b69fd0eddb5..5821940d2c2 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
# std imports
import math
import numpy as np
diff --git a/Framework/PythonInterface/mantid/plots/utility.py b/Framework/PythonInterface/mantid/plots/utility.py
index a3a4b2f6a66..284654faeab 100644
--- a/Framework/PythonInterface/mantid/plots/utility.py
+++ b/Framework/PythonInterface/mantid/plots/utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
# std imports
import math
import numpy as np
diff --git a/Framework/PythonInterface/mantid/py3compat/enum.py b/Framework/PythonInterface/mantid/py3compat/enum.py
index d070916a6cd..135e1a0617e 100644
--- a/Framework/PythonInterface/mantid/py3compat/enum.py
+++ b/Framework/PythonInterface/mantid/py3compat/enum.py
@@ -20,8 +20,6 @@
"""Python enumerations.
"""
-from __future__ import absolute_import, print_function, unicode_literals
-
import re
import sys
import warnings
diff --git a/Framework/PythonInterface/mantid/py3compat/mock.py b/Framework/PythonInterface/mantid/py3compat/mock.py
index 16a2c781934..99bc501721f 100644
--- a/Framework/PythonInterface/mantid/py3compat/mock.py
+++ b/Framework/PythonInterface/mantid/py3compat/mock.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
try:
# import for python 2 and python 3 with mock package installed
from mock import * # noqa
diff --git a/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py b/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
index faeeb73ad49..f223cf07da6 100644
--- a/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
+++ b/Framework/PythonInterface/plugins/algorithms/ApplyDetectorScanEffCorr.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
from mantid.simpleapi import CreateWorkspace, Transpose, Multiply, MaskDetectors
from mantid.api import AlgorithmFactory, PropertyMode, PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py b/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
index acfc065d3e2..a62ddc3e8d6 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateEfficiencyCorrection.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
import numpy as np
from mantid.simpleapi import \
diff --git a/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py b/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
index 938a60db109..53457a48139 100644
--- a/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
+++ b/Framework/PythonInterface/plugins/algorithms/FitIncidentSpectrum.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from copy import copy
import numpy as np
from scipy import signal, ndimage, interpolate
diff --git a/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py b/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
index 0a652ac6aa8..a3a7ca9b102 100644
--- a/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
+++ b/Framework/PythonInterface/plugins/algorithms/OrderWorkspaceHistory.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
-
import os
import tokenize
import glob
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveYDA.py b/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
index c2fe2aa45ee..2b0f0a5ffed 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveYDA.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, CompositeValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
index db0196c14bb..d8f84413e89 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MultipleFileProperty, FileAction, WorkspaceProperty
from mantid.kernel import Direction, UnitConversion, Elastic, Property, IntArrayProperty, StringListValidator
from mantid.simpleapi import (mtd, SetGoniometer, AddSampleLog, MaskBTP, RenameWorkspace, GroupWorkspaces,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
index 9e23a4bec09..b1503088557 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/WANDPowderReduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty, PropertyMode,
IEventWorkspace)
diff --git a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
index 83d65de0799..e300846f0f4 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
@@ -11,8 +11,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division
-
import unittest
from mantid.plots.utility import legend_set_draggable
diff --git a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
index 6c0affbfce8..030665e0ad3 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
index c32a344fb4c..d087c00db41 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_imshow.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
index e3c98982cf0..a8b8b6c7b3a 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_modest_image.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
import itertools
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
index 927381b902a..363afcedad1 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/modest_image/test_speed.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, division
from time import time
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
index 569619dd069..e227c0cc7b0 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plotfunctionsTest.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
index 91912d78993..2d0d21bdb7c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ConvertWANDSCDtoQTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import ConvertWANDSCDtoQ, CreateMDHistoWorkspace, CreateSingleValuedWorkspace, SetUB, mtd
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
index 9989f483076..85624f22198 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import HB2AReduce
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
index cda4f1f4a25..d46aa9a7556 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadWANDSCDTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import LoadWANDSCD
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
index 2b4a59942f1..8e7c10fad6f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/LoadWANDTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import LoadWAND
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
index 8ade53fe51c..50adc528833 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/WANDPowderReductionTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
from mantid.simpleapi import (WANDPowderReduction,
CreateSampleWorkspace, RotateInstrumentComponent,
MoveInstrumentComponent, CloneWorkspace, AddSampleLog)
diff --git a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
index e263aa08148..6052818231a 100644
--- a/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
+++ b/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelper/__init__.py
@@ -4,6 +4,4 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from _WorkspaceCreationHelper import *
diff --git a/MantidPlot/test/MantidPlotMatplotlibTest.py b/MantidPlot/test/MantidPlotMatplotlibTest.py
index 6da54072598..99ecc31cbf2 100644
--- a/MantidPlot/test/MantidPlotMatplotlibTest.py
+++ b/MantidPlot/test/MantidPlotMatplotlibTest.py
@@ -7,8 +7,6 @@
"""
Test matplotlib plotting for MantidPlot. Without our custom backend matplotlib graphs crash MantidPlot.
"""
-from __future__ import print_function
-
import mantidplottests
from mantidplottests import *
import time
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
index fe78125a853..731b3e3d3b4 100755
--- a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
+++ b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
@@ -7,7 +7,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# vim: encoding=utf-8
-from __future__ import print_function
import shutil, os, sys
from os.path import isdir, isfile, islink, join
from optparse import OptionParser
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
index b97709ce36d..abf167bb3cf 100644
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import re
#import sys
#import getopt
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
index 2e17ecdb3c7..ed751d79ec3 100755
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import
-
__all__ = ['main']
import sys
diff --git a/buildconfig/CMake/FindPyQt.py b/buildconfig/CMake/FindPyQt.py
index a4d8d416600..f938011abd1 100644
--- a/buildconfig/CMake/FindPyQt.py
+++ b/buildconfig/CMake/FindPyQt.py
@@ -4,8 +4,6 @@
There is a commandline argument to select the version of PyQt.
"""
-from __future__ import print_function
-
import argparse
import os
import pprint
diff --git a/qt/applications/workbench/workbench/config/test/test_user.py b/qt/applications/workbench/workbench/config/test/test_user.py
index 2dea80396b9..f10164855d6 100644
--- a/qt/applications/workbench/workbench/config/test/test_user.py
+++ b/qt/applications/workbench/workbench/config/test/test_user.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
import os
from unittest import TestCase, main
diff --git a/qt/applications/workbench/workbench/plotting/figurewindow.py b/qt/applications/workbench/workbench/plotting/figurewindow.py
index 2062f268634..d51ba6b1837 100644
--- a/qt/applications/workbench/workbench/plotting/figurewindow.py
+++ b/qt/applications/workbench/workbench/plotting/figurewindow.py
@@ -8,8 +8,6 @@
#
#
"""Provides the QMainWindow subclass for a plotting window"""
-from __future__ import absolute_import
-
# std imports
import weakref
diff --git a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
index 7f0c8cf2f29..a99d1f508ba 100644
--- a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
+++ b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
import atexit
import gc
diff --git a/qt/applications/workbench/workbench/plotting/test/test_utility.py b/qt/applications/workbench/workbench/plotting/test/test_utility.py
index 9927c34aa0d..d4e3fc6c4af 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_utility.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_utility.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid package
-from __future__ import absolute_import
-
import unittest
import matplotlib.pyplot as plt
diff --git a/qt/applications/workbench/workbench/plugins/base.py b/qt/applications/workbench/workbench/plugins/base.py
index 3701a411db1..ee978e9f9b7 100644
--- a/qt/applications/workbench/workbench/plugins/base.py
+++ b/qt/applications/workbench/workbench/plugins/base.py
@@ -8,8 +8,6 @@
#
#
"""Provides a widget to wrap common behaviour for all plugins"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QDockWidget, QMainWindow, QWidget
diff --git a/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py b/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
index a2cbe241dd5..f0aa51665be 100644
--- a/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
+++ b/qt/applications/workbench/workbench/plugins/exception_handler/__init__.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import traceback
from ErrorReporter.error_report_presenter import ErrorReporterPresenter
diff --git a/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py b/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
index d7eac019918..3d3d4c0eb98 100644
--- a/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
+++ b/qt/applications/workbench/workbench/plugins/exception_handler/error_messagebox.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
index 378cd501cef..1f8a15d4e32 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, unicode_literals
-
import unittest
from mantid import UsageService
diff --git a/qt/applications/workbench/workbench/requirements.py b/qt/applications/workbench/workbench/requirements.py
index a695991d216..47dade02d65 100644
--- a/qt/applications/workbench/workbench/requirements.py
+++ b/qt/applications/workbench/workbench/requirements.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Defines methods to check requirements for the application
"""
-from __future__ import absolute_import
-
from distutils.version import LooseVersion
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/model.py b/qt/applications/workbench/workbench/widgets/plotselector/model.py
index 8a9824d7669..e172968e92c 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/model.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
from workbench.plotting.globalfiguremanager import FigureAction
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/presenter.py b/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
index ae58ca8efbe..cafb3f897c8 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import os
import re
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
index 00c53750415..850411c0889 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
import unittest
from mantid.py3compat import mock
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
index c1cc8e2e4ab..f2250c64da7 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
import os
import unittest
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
index d413a60e1a5..f24726cf95d 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtTest import QTest
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/view.py b/qt/applications/workbench/workbench/widgets/plotselector/view.py
index 9f7c32e2e1a..e909f3022af 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import re
from qtpy.QtCore import Qt, Signal, QMutex, QMutexLocker
from qtpy.QtWidgets import (QAbstractItemView, QAction, QActionGroup, QFileDialog, QHBoxLayout, QHeaderView, QLineEdit,
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py b/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
index 8071f360fcc..e0efb728e11 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.api import AlgorithmFactory
from mantid.kernel import ConfigService
from workbench.widgets.settings.categories.view import CategoriesSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
index 0b06caf0564..4466e836cd5 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
from mantid.py3compat.mock import call, Mock, patch, ANY
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/view.py b/qt/applications/workbench/workbench/widgets/settings/categories/view.py
index 3b38e107e8c..e10e2f3d7e5 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QTreeWidgetItem
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py b/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
index a674816ec97..dadc2384550 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.api import FunctionFactory
from mantid.kernel import ConfigService
from workbench.widgets.settings.fitting.view import FittingSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
index d0c762435d8..e6b9a23bcbf 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
from mantid.py3compat.mock import Mock, patch
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/view.py b/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
index b1b34c71bf0..e1782b8d709 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from mantidqt.utils.qt import load_ui
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/presenter.py b/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
index d978f76115c..a40bab6af10 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.kernel import ConfigService
from workbench.config import CONF
from workbench.widgets.settings.general.view import GeneralSettingsView
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
index ffc88ebd93f..7ea961abbb8 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
import sys
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/view.py b/qt/applications/workbench/workbench/widgets/settings/general/view.py
index 37dee2ea68d..e740ff56c44 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QFontDialog
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py b/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
index d14e3dc0715..644082ca085 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench
#
#
-from __future__ import absolute_import, unicode_literals
-
from mantid.kernel import ConfigService
from workbench.widgets.settings.plots.view import PlotsSettingsView
from workbench.plotting.style import VALID_LINE_STYLE
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
index 4e620ea673e..e1e38891dd2 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
from mantid.py3compat.mock import call, patch
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/view.py b/qt/applications/workbench/workbench/widgets/settings/plots/view.py
index 3825049b5ab..4191bbbe098 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from mantidqt.utils.qt import load_ui
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
index 1e84dec45b2..76f9bd30c50 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from unittest import TestCase
from mantid.py3compat.mock import call, Mock
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
index 181b5935650..bc21c677988 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
import unittest
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/qt/applications/workbench/workbench/widgets/settings/view.py b/qt/applications/workbench/workbench/widgets/settings/view.py
index 68a36a91350..a4431b901a8 100644
--- a/qt/applications/workbench/workbench/widgets/settings/view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import absolute_import, unicode_literals
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
index 7511ec7faff..60f69d96666 100644
--- a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
+++ b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
from mantid.api import WorkspaceFactory
diff --git a/qt/python/mantidqt/plotting/figuretype.py b/qt/python/mantidqt/plotting/figuretype.py
index d2576f307f2..b1590a40103 100644
--- a/qt/python/mantidqt/plotting/figuretype.py
+++ b/qt/python/mantidqt/plotting/figuretype.py
@@ -10,8 +10,6 @@
"""
Provides facilities to check plot types
"""
-from __future__ import absolute_import
-
# third party
from enum import Enum
from matplotlib.container import ErrorbarContainer
diff --git a/qt/python/mantidqt/plotting/test/test_functions.py b/qt/python/mantidqt/plotting/test/test_functions.py
index 6dcd7c66a00..b31e166051d 100644
--- a/qt/python/mantidqt/plotting/test/test_functions.py
+++ b/qt/python/mantidqt/plotting/test/test_functions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
from unittest import TestCase, main
diff --git a/qt/python/mantidqt/plotting/test/test_tiledplots.py b/qt/python/mantidqt/plotting/test/test_tiledplots.py
index cd2c6e2856a..89a874301d2 100644
--- a/qt/python/mantidqt/plotting/test/test_tiledplots.py
+++ b/qt/python/mantidqt/plotting/test/test_tiledplots.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# std imports
from unittest import TestCase, main
diff --git a/qt/python/mantidqt/test/test_algorithm_observer.py b/qt/python/mantidqt/test/test_algorithm_observer.py
index 6d3af4559e8..107a40035fa 100644
--- a/qt/python/mantidqt/test/test_algorithm_observer.py
+++ b/qt/python/mantidqt/test/test_algorithm_observer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
import unittest
from mantid.api import AlgorithmObserver, AlgorithmManager, AlgorithmFactory, PythonAlgorithm, Progress
diff --git a/qt/python/mantidqt/utils/qt/__init__.py b/qt/python/mantidqt/utils/qt/__init__.py
index 1d6d36c2707..190bf85e344 100644
--- a/qt/python/mantidqt/utils/qt/__init__.py
+++ b/qt/python/mantidqt/utils/qt/__init__.py
@@ -9,8 +9,6 @@
#
"""A selection of utility functions related to Qt functionality
"""
-from __future__ import absolute_import
-
# stdlib modules
import os.path as osp
from contextlib import contextmanager
diff --git a/qt/python/mantidqt/utils/qt/testing/__init__.py b/qt/python/mantidqt/utils/qt/testing/__init__.py
index 7ff5da2bc57..e44f45c6cda 100644
--- a/qt/python/mantidqt/utils/qt/testing/__init__.py
+++ b/qt/python/mantidqt/utils/qt/testing/__init__.py
@@ -10,8 +10,6 @@
# flake8: noqa
"""A selection of utility functions related to testing of Qt-based GUI elements.
"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt, QObject
from .application import get_application
diff --git a/qt/python/mantidqt/utils/qt/testing/application.py b/qt/python/mantidqt/utils/qt/testing/application.py
index 4efe6d044af..434de477aa1 100644
--- a/qt/python/mantidqt/utils/qt/testing/application.py
+++ b/qt/python/mantidqt/utils/qt/testing/application.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import atexit
import sys
import traceback
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
index c6cf9329528..64536b5ec4d 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import inspect
import six
import traceback
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_window_test.py b/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
index c8afa8a21be..f48e763f6d0 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_window_test.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import print_function
import inspect
import platform
import sys
diff --git a/qt/python/mantidqt/utils/qt/testing/modal_tester.py b/qt/python/mantidqt/utils/qt/testing/modal_tester.py
index 95e92319daa..5567957383a 100644
--- a/qt/python/mantidqt/utils/qt/testing/modal_tester.py
+++ b/qt/python/mantidqt/utils/qt/testing/modal_tester.py
@@ -25,8 +25,6 @@ class TestModalDialog(unittest.TestCase):
tester.start()
self.assertTrue(tester.passed)
"""
-from __future__ import absolute_import
-
import traceback
from qtpy.QtCore import QTimer
diff --git a/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py b/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
index bc5a648f3c2..058f60d503c 100644
--- a/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
+++ b/qt/python/mantidqt/utils/qt/testing/qt_assertions_helper.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from qtpy.QtWidgets import QPushButton
diff --git a/qt/python/mantidqt/utils/show_in_explorer.py b/qt/python/mantidqt/utils/show_in_explorer.py
index 0892016c1f9..b5b72af9e4c 100644
--- a/qt/python/mantidqt/utils/show_in_explorer.py
+++ b/qt/python/mantidqt/utils/show_in_explorer.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
import subprocess
import sys
diff --git a/qt/python/mantidqt/utils/test/test_async.py b/qt/python/mantidqt/utils/test/test_async.py
index 4bfdc7eeefb..896900555a8 100644
--- a/qt/python/mantidqt/utils/test/test_async.py
+++ b/qt/python/mantidqt/utils/test/test_async.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
# system imports
import traceback
import unittest
diff --git a/qt/python/mantidqt/utils/testing/__init__.py b/qt/python/mantidqt/utils/testing/__init__.py
index 0fb72b0143f..5d9ba75dbc7 100644
--- a/qt/python/mantidqt/utils/testing/__init__.py
+++ b/qt/python/mantidqt/utils/testing/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py b/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
index a41c9ea53b9..f7f950ea365 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_codeeditor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/python/mantidqt/utils/testing/strict_mock.py b/qt/python/mantidqt/utils/testing/strict_mock.py
index bcedfc3f1a5..722040aff08 100644
--- a/qt/python/mantidqt/utils/testing/strict_mock.py
+++ b/qt/python/mantidqt/utils/testing/strict_mock.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
from mantid.py3compat.mock import Mock, PropertyMock
diff --git a/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py b/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
index 53dc193903d..dc602bd8551 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/algorithm_factory_observer.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
-
from mantid.api import AlgorithmFactoryObserver
diff --git a/qt/python/mantidqt/widgets/algorithmselector/model.py b/qt/python/mantidqt/widgets/algorithmselector/model.py
index d1c1b61ed30..f842c62f01f 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/model.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from mantid.api import AlgorithmFactory, AlgorithmManager, IWorkspaceProperty
from mantid.kernel import Direction
diff --git a/qt/python/mantidqt/widgets/algorithmselector/presenter.py b/qt/python/mantidqt/widgets/algorithmselector/presenter.py
index a7625aea078..a7ded888d26 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/presenter.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from collections import namedtuple
from .model import AlgorithmSelectorModel
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
index 20d7ed548cd..987b823bf66 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
import unittest
from mantid.api import AlgorithmFactory, PythonAlgorithm
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
index a9f0d1dca63..d4fb43293aa 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import
-
from collections import Counter, namedtuple
import unittest
diff --git a/qt/python/mantidqt/widgets/algorithmselector/widget.py b/qt/python/mantidqt/widgets/algorithmselector/widget.py
index f09a4be91d4..04efba95163 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/widget.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import re
import qtpy
diff --git a/qt/python/mantidqt/widgets/codeeditor/execution.py b/qt/python/mantidqt/widgets/codeeditor/execution.py
index c78a7ce1fed..d5457fc4896 100644
--- a/qt/python/mantidqt/widgets/codeeditor/execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/execution.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import absolute_import, unicode_literals
-
import __future__
import ast
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
index 0fb72b0143f..5d9ba75dbc7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
index 1fe3d36987c..2d2c99b0c60 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
from mantid.kernel import logger
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
index d8fdca3e96a..4981f50c8f5 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/codeeditor_tab_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QColor
from qtpy.QtWidgets import QAction, QHBoxLayout, QMenu, QPushButton, QSizePolicy, QTabWidget, QWidget
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
index 0fb72b0143f..5d9ba75dbc7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
index 58c49917269..6d8a4859e85 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import os
from unittest import TestCase
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
index 09a382cd30d..f9df768897c 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import absolute_import
-
import unittest
from qtpy.QtWidgets import QAction, QApplication, QWidget
diff --git a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
index 74bb51eab5d..8e5e88fe1b7 100644
--- a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
+++ b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import, unicode_literals
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/jupyterconsole.py b/qt/python/mantidqt/widgets/jupyterconsole.py
index c5aa0d961c9..4e6eab9d12a 100644
--- a/qt/python/mantidqt/widgets/jupyterconsole.py
+++ b/qt/python/mantidqt/widgets/jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import absolute_import
-
# system imports
import types
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
index 72b439918dc..b71e9ce8313 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
import matplotlib as mpl
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
index 0bf01b069e8..f30b8811cbd 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
import matplotlib as mpl
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
index b31e8ab2208..bca546995f3 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, division, print_function
-
from mantid.plots.utility import MantidAxType
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
from mantidqt.widgets.workspacedisplay.data_copier import DataCopier
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
index 32601751048..66e59e648b6 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import absolute_import
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
index 73547841093..dce81680162 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, absolute_import, division, division, print_function, print_function
-
import unittest
import qtpy
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
index 3e6e906b83d..7800c021a01 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import absolute_import
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
index 410006c5cb5..1ded4e789b3 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import absolute_import
-
-
class ErrorColumn:
CANNOT_SET_Y_TO_BE_OWN_YERR_MESSAGE = "Cannot set Y column to be its own YErr"
UNHANDLED_COMPARISON_LOGIC_MESSAGE = "Unhandled comparison logic with type {}"
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
index 3cdd9b938c1..0f3f73aa6bd 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import absolute_import
-
-
class MarkedColumns:
X_LABEL = "[X{}]"
Y_LABEL = "[Y{}]"
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
index ebf0f80798e..99326805af8 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of mantidqt package.
-from __future__ import absolute_import, division, print_function
-
from functools import partial
from qtpy.QtCore import Qt
diff --git a/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py b/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
index 18c0a2ad53a..9b1187b72fc 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import absolute_import, print_function
-
import unittest
from mantidqt.widgets.workspacewidget.workspacetreewidget import WorkspaceTreeWidget
diff --git a/scripts/BilbyCustomFunctions_Reduction.py b/scripts/BilbyCustomFunctions_Reduction.py
index 29d574d9f6b..a9ed4c2c3ad 100644
--- a/scripts/BilbyCustomFunctions_Reduction.py
+++ b/scripts/BilbyCustomFunctions_Reduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
import csv
import math
from itertools import product
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
index 9798d847093..d4f29605086 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_All.py
@@ -58,8 +58,6 @@ Calibration technique: Finding tubes not well calibrated
"""
-from __future__ import absolute_import, division, print_function
-
import mantid.simpleapi as mantid
import tube
import numpy
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
index b9c62e695f4..2d1ea2e243e 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
index d63b0541c99..ba188c23b0e 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3.py
@@ -11,8 +11,6 @@
# Here we run the calibration of a selected part of MAPS consisting of several components
# by running setTubeSpecByString several times.
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_spec import TubeSpec
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
index 7db8de221f4..fef52b03398 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_C4C3C2.py
@@ -11,8 +11,6 @@
# Here we run the calibration of a selected part of MAPS consisting of several components
# specifying them in an array of strings.
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
index 11912b5b888..11e23633a42 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
index 196030a2e59..dcfa9ed3df9 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D2_WideMargins.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py b/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
index f313d1fe182..4f3201c99a2 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMaps_D4.py
@@ -10,8 +10,6 @@
#
# Here we run the calibration of a selected part of MAPS
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMerlin.py b/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
index 40d3abde9b5..98bff03d25a 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMerlin.py
@@ -49,8 +49,6 @@ The previous calibrated instrument view:
.. sectionauthor:: Gesner Passos - ISIS
"""
-from __future__ import absolute_import, division, print_function
-
import numpy
import mantid.simpleapi as mantid
import tube
diff --git a/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py b/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
index 53b4fc586a9..c5b141cafab 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoMerlin_Simple.py
@@ -18,8 +18,6 @@
# The workspace with calibrated instrument is saved to a Nexus file
#
-from __future__ import absolute_import, division, print_function
-
import tube
from tube_calib_fit_params import TubeCalibFitParams
import numpy
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish0.py b/scripts/Calibration/Examples/TubeCalibDemoWish0.py
index 31e780d7939..685414c4642 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish0.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish0.py
@@ -15,8 +15,6 @@
# because we do not consider the upper and lower position of the tubes around the
# WISH instrument.
#
-from __future__ import absolute_import, division, print_function
-
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish1.py b/scripts/Calibration/Examples/TubeCalibDemoWish1.py
index 89204997b83..9837db0168f 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish1.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish1.py
@@ -12,8 +12,6 @@
# We base the ideal tube on one tube of this door.
#
-from __future__ import absolute_import, division, print_function
-
import tube
reload(tube) # noqa
from tube_spec import TubeSpec
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py b/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
index ba7205080ba..354f32c0ca3 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
@@ -18,8 +18,6 @@ to calibrate the whole instrument.
"""
-from __future__ import absolute_import, division, print_function
-
import numpy
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py b/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
index a3aca6bee7e..d604c5bf71a 100644
--- a/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
+++ b/scripts/Calibration/Examples/TubeCalibDemoWish_Simple.py
@@ -11,8 +11,6 @@
# Here we run the calibration of WISH panel03 using a simple CalibrateWish function.
#
-from __future__ import absolute_import, division, print_function
-
import numpy
import tube
import mantid.simpleapi as mantid
diff --git a/scripts/Calibration/tube.py b/scripts/Calibration/tube.py
index ef121149f2b..781408f6e86 100644
--- a/scripts/Calibration/tube.py
+++ b/scripts/Calibration/tube.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import absolute_import, division, print_function
-
import numpy
import os
import re
diff --git a/scripts/Calibration/tube_calib.py b/scripts/Calibration/tube_calib.py
index bc5c1b88ad2..a529c1c5e92 100644
--- a/scripts/Calibration/tube_calib.py
+++ b/scripts/Calibration/tube_calib.py
@@ -16,8 +16,6 @@ Users should not need to directly call any other function other than :func:`getC
"""
## Author: Karl palmen ISIS and for readPeakFile Gesner Passos ISIS
-from __future__ import absolute_import, division, print_function
-
import numpy
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/scripts/Calibration/tube_calib_fit_params.py b/scripts/Calibration/tube_calib_fit_params.py
index 7d419298382..49b229c0d40 100644
--- a/scripts/Calibration/tube_calib_fit_params.py
+++ b/scripts/Calibration/tube_calib_fit_params.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, division, print_function
-
-
class TubeCalibFitParams(object):
# This class is to take the fitting method and parameters for fitting the peaks created by the calibration slits etc
diff --git a/scripts/Calibration/tube_spec.py b/scripts/Calibration/tube_spec.py
index f86b60538a2..0cc499bce8f 100644
--- a/scripts/Calibration/tube_spec.py
+++ b/scripts/Calibration/tube_spec.py
@@ -12,9 +12,6 @@
# Author: Karl Palmen ISIS
-from __future__ import absolute_import, division, print_function
-
-
class TubeSpec:
"""
The python class :class:`~tube_spec.TubeSpec` provides a way of specifying a set of tubes for
diff --git a/scripts/Elemental_Analysis.py b/scripts/Elemental_Analysis.py
index ef3ed66f828..51c824c0f67 100644
--- a/scripts/Elemental_Analysis.py
+++ b/scripts/Elemental_Analysis.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from qtpy import QtCore
from Muon.GUI.ElementalAnalysis.elemental_analysis import ElementalAnalysisGui
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/HFIR_4Circle_Reduction/process_mask.py b/scripts/HFIR_4Circle_Reduction/process_mask.py
index d22307f9437..bd240492ab0 100644
--- a/scripts/HFIR_4Circle_Reduction/process_mask.py
+++ b/scripts/HFIR_4Circle_Reduction/process_mask.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import math
import numpy
import re
diff --git a/scripts/Inelastic/dos/__init__.py b/scripts/Inelastic/dos/__init__.py
index c292a33b86a..479ea6a6fd5 100644
--- a/scripts/Inelastic/dos/__init__.py
+++ b/scripts/Inelastic/dos/__init__.py
@@ -10,6 +10,4 @@ load_castep -- Parses a castep file into a file data object
load_phonon -- Parses a phonon file into a file data object
"""
-from __future__ import absolute_import
-
__all__=['load_castep','load_phonon', 'load_helper']
diff --git a/scripts/Inelastic/vesuvio/__init__.py b/scripts/Inelastic/vesuvio/__init__.py
index ae05f817894..777ef7a03ed 100644
--- a/scripts/Inelastic/vesuvio/__init__.py
+++ b/scripts/Inelastic/vesuvio/__init__.py
@@ -15,6 +15,4 @@ profiles -- Defines mass profiles
testing -- Simulates Vesuvio data for use in tests
"""
-from __future__ import absolute_import
-
__all__=['backgrounds','base','commands','fitting','instrument','profiles', 'testing']
diff --git a/scripts/Interface/ui/sans_isis/add_runs_page.py b/scripts/Interface/ui/sans_isis/add_runs_page.py
index 1ba692ab01e..9461c580054 100644
--- a/scripts/Interface/ui/sans_isis/add_runs_page.py
+++ b/scripts/Interface/ui/sans_isis/add_runs_page.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
diff --git a/scripts/Interface/ui/sans_isis/work_handler.py b/scripts/Interface/ui/sans_isis/work_handler.py
index 19b6b053273..1628d5e24b8 100644
--- a/scripts/Interface/ui/sans_isis/work_handler.py
+++ b/scripts/Interface/ui/sans_isis/work_handler.py
@@ -14,8 +14,6 @@ The "worker" handles running the function via a unique process ID; "listeners" m
each process which are then notified upon certain actions (such as an error being thrown by the
worker, or the worker finishing its task) using the nested class WorkListener.
"""
-from __future__ import absolute_import
-
from qtpy.QtCore import Slot, QThreadPool
from abc import ABCMeta, abstractmethod
from six import with_metaclass
diff --git a/scripts/MSlice.py b/scripts/MSlice.py
index 89c3f329789..fd666becbc7 100755
--- a/scripts/MSlice.py
+++ b/scripts/MSlice.py
@@ -5,7 +5,5 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from mslice.app import show_gui
show_gui()
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
index 772e1c579cc..7552cc5daa3 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
-
class QuickEditPresenter(object):
def __init__(self, view):
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_view.py b/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
index d03db00ff0d..af2c38de570 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
from qtpy import QtWidgets, QtCore
import qtpy
from MultiPlotting.AxisChanger.axis_changer_presenter import AxisChangerPresenter
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py b/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
index f6a0eeb23aa..f20c3c74555 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from MultiPlotting.QuickEdit.quickEdit_view import QuickEditView
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
diff --git a/scripts/MultiPlotting/label.py b/scripts/MultiPlotting/label.py
index aeb8572e3a5..c89ce83666c 100644
--- a/scripts/MultiPlotting/label.py
+++ b/scripts/MultiPlotting/label.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
-
class Label(object):
def __init__(
diff --git a/scripts/MultiPlotting/multi_plotting_context.py b/scripts/MultiPlotting/multi_plotting_context.py
index e1ef31e584e..f784a705178 100644
--- a/scripts/MultiPlotting/multi_plotting_context.py
+++ b/scripts/MultiPlotting/multi_plotting_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from MultiPlotting.gridspec_engine import gridspecEngine
from MultiPlotting.subplot.subplot_context import subplotContext
diff --git a/scripts/Muon/GUI/Common/load_widget/load_presenter.py b/scripts/Muon/GUI/Common/load_widget/load_presenter.py
index 5751995d4e2..1ddd040989e 100644
--- a/scripts/Muon/GUI/Common/load_widget/load_presenter.py
+++ b/scripts/Muon/GUI/Common/load_widget/load_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from Muon.GUI.Common import thread_model
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/Common/load_widget/load_view.py b/scripts/Muon/GUI/Common/load_widget/load_view.py
index 282eb57c96c..ff2720d2ba5 100644
--- a/scripts/Muon/GUI/Common/load_widget/load_view.py
+++ b/scripts/Muon/GUI/Common/load_widget/load_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets, QtCore
from mantidqt.widgets import manageuserdirectories
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
index 8f215fe2bcc..0cb5b64c7a8 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import mantid.simpleapi as mantid
from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
index 0471c74ce6e..2c6fa7fb929 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import os
import json
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
index 545afb72217..9b64a8fefa1 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
from Muon.GUI.Common import message_box
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
index cd9aa7647a7..3601dc9ab2d 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import
-
from qtpy import QtWidgets
from Muon.GUI.ElementalAnalysis.PeriodicTable import periodic_table
diff --git a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
index 5bf351f00ed..488bf1e6011 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from qtpy import QtWidgets
from copy import deepcopy
import matplotlib as mpl
diff --git a/scripts/plotting_test.py b/scripts/plotting_test.py
index 91df6bc12ec..cecfc43b99b 100644
--- a/scripts/plotting_test.py
+++ b/scripts/plotting_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
from PyQt4 import QtGui
import sys
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
index 7d0b6289b4c..f9b94445cd8 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
index 2bea4c6e89c..4acee58568b 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/element_button_test.py b/scripts/test/Muon/elemental_analysis/element_button_test.py
index c6e8c83671c..40bc461479e 100644
--- a/scripts/test/Muon/elemental_analysis/element_button_test.py
+++ b/scripts/test/Muon/elemental_analysis/element_button_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
index 45f2c9218cb..e91a3f9a52f 100644
--- a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
+++ b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import copy
import unittest
diff --git a/scripts/test/Muon/elemental_analysis/load_model_test.py b/scripts/test/Muon/elemental_analysis/load_model_test.py
index c24b8ce1b53..171f107ceda 100644
--- a/scripts/test/Muon/elemental_analysis/load_model_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/name_generator_test.py b/scripts/test/Muon/elemental_analysis/name_generator_test.py
index 82e5f26b71f..8f83c5377e6 100644
--- a/scripts/test/Muon/elemental_analysis/name_generator_test.py
+++ b/scripts/test/Muon/elemental_analysis/name_generator_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import absolute_import, print_function
-
import unittest
import sys
diff --git a/scripts/test/Muon/elemental_analysis/peak_data_file_test.py b/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
index 8e2c999b554..369ae7d903d 100644
--- a/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
+++ b/scripts/test/Muon/elemental_analysis/peak_data_file_test.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
import unittest
import json
diff --git a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
index a8c5c7adf77..6a779ef519d 100644
--- a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
+++ b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
index 97562c510dc..c28f476cc13 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/periodic_list_test.py b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
index 641b8bc5a22..978df4affcd 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_list_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
index c67fe8dbef2..33c165ca34b 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
index 93888654fe9..6c849cab158 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function, absolute_import
-
import unittest
from mantid.py3compat import mock
diff --git a/tools/reports/display_jenkins_build_queue.py b/tools/reports/display_jenkins_build_queue.py
index 2c2989ac629..8cb5dbe279f 100755
--- a/tools/reports/display_jenkins_build_queue.py
+++ b/tools/reports/display_jenkins_build_queue.py
@@ -5,8 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import print_function
-
import posixpath as path
import pprint
diff --git a/tools/skipped_systemtests.py b/tools/skipped_systemtests.py
index b699ee4f3d3..dec309fd700 100755
--- a/tools/skipped_systemtests.py
+++ b/tools/skipped_systemtests.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#!/usr/bin/env python
-from __future__ import absolute_import, division, print_function
import datetime
import requests # python-requests
--
GitLab
From 1b8c5c3207127969b29bdc255c7f06d33cccc9d0 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 13:20:42 +0000
Subject: [PATCH 02/37] RE #27722 Remove future imports, brackets, one line
Removes all of the from __future__ imports that open and close the
brackets on the same line. This is most of them.
---
Framework/Doxygen/make_header.py | 1 -
Framework/PythonInterface/mantid/__init__.py | 3 +--
Framework/PythonInterface/mantid/_plugins/__init__.py | 3 +--
Framework/PythonInterface/mantid/api/_workspaceops.py | 3 +--
Framework/PythonInterface/mantid/geometry/_aliases.py | 3 +--
Framework/PythonInterface/mantid/kernel/_aliases.py | 3 +--
Framework/PythonInterface/mantid/kernel/funcinspect.py | 3 +--
Framework/PythonInterface/mantid/kernel/plugins.py | 3 +--
Framework/PythonInterface/mantid/plots/__init__.py | 3 ---
Framework/PythonInterface/mantid/plots/_compatability.py | 2 --
Framework/PythonInterface/mantid/plots/axesfunctions.py | 2 --
Framework/PythonInterface/mantid/plots/axesfunctions3D.py | 2 --
Framework/PythonInterface/mantid/plots/datafunctions.py | 2 --
Framework/PythonInterface/mantid/plots/legend.py | 2 --
Framework/PythonInterface/mantid/plots/scales.py | 2 --
Framework/PythonInterface/mantid/py3compat/__init__.py | 2 --
Framework/PythonInterface/mantid/simpleapi.py | 2 --
Framework/PythonInterface/plugins/algorithms/Abins.py | 2 --
.../plugins/algorithms/AlignAndFocusPowderFromFiles.py | 2 --
.../PythonInterface/plugins/algorithms/AlignComponents.py | 2 --
.../plugins/algorithms/AngularAutoCorrelationsSingleAxis.py | 1 -
.../plugins/algorithms/AngularAutoCorrelationsTwoAxes.py | 1 -
.../plugins/algorithms/ApplyNegMuCorrection.py | 2 --
.../plugins/algorithms/BASISCrystalDiffraction.py | 2 --
.../PythonInterface/plugins/algorithms/BASISDiffraction.py | 2 --
.../plugins/algorithms/BASISPowderDiffraction.py | 2 --
.../PythonInterface/plugins/algorithms/BASISReduction.py | 2 --
Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py | 2 --
.../PythonInterface/plugins/algorithms/CalculateFlux.py | 1 -
.../plugins/algorithms/CalculateSampleTransmission.py | 2 --
.../plugins/algorithms/CalibrateRectangularDetectors.py | 2 --
.../PythonInterface/plugins/algorithms/CheckForSampleLogs.py | 2 --
.../PythonInterface/plugins/algorithms/CleanFileCache.py | 2 --
.../plugins/algorithms/CollectHB3AExperimentInfo.py | 2 --
.../PythonInterface/plugins/algorithms/CompareSampleLogs.py | 2 --
.../plugins/algorithms/ComputeCalibrationCoefVan.py | 2 --
.../plugins/algorithms/ComputeIncoherentDOS.py | 2 --
Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py | 2 --
.../PythonInterface/plugins/algorithms/ConjoinSpectra.py | 2 --
.../plugins/algorithms/ConvertSnsRoiFileToMask.py | 2 --
.../PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py | 1 -
.../PythonInterface/plugins/algorithms/CorrectLogTimes.py | 2 --
Framework/PythonInterface/plugins/algorithms/CorrectTOF.py | 2 --
.../plugins/algorithms/CreateCacheFilename.py | 2 --
.../plugins/algorithms/CreateEmptyTableWorkspace.py | 2 --
.../plugins/algorithms/CreateLeBailFitInput.py | 2 --
.../plugins/algorithms/CropWorkspaceForMDNorm.py | 2 --
.../plugins/algorithms/CropWorkspaceRagged.py | 1 -
.../plugins/algorithms/CylinderPaalmanPingsCorrection2.py | 2 --
.../plugins/algorithms/DNSComputeDetEffCorrCoefs.py | 1 -
.../plugins/algorithms/DNSFlippingRatioCorr.py | 1 -
Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py | 1 -
.../PythonInterface/plugins/algorithms/DPDFreduction.py | 1 -
Framework/PythonInterface/plugins/algorithms/DSFinterp.py | 1 -
.../PythonInterface/plugins/algorithms/DakotaChiSquared.py | 2 --
Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py | 1 -
.../PythonInterface/plugins/algorithms/EnggCalibrate.py | 1 -
.../PythonInterface/plugins/algorithms/EnggCalibrateFull.py | 1 -
Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py | 1 -
.../plugins/algorithms/EnggFitTOFFromPeaks.py | 1 -
Framework/PythonInterface/plugins/algorithms/EnggFocus.py | 1 -
.../plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py | 2 --
.../plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py | 2 --
.../plugins/algorithms/EnggVanadiumCorrections.py | 1 -
.../plugins/algorithms/ExaminePowderDiffProfile.py | 1 -
.../plugins/algorithms/Examples/ExampleSaveAscii.py | 1 -
.../PythonInterface/plugins/algorithms/Examples/Squares.py | 1 -
.../plugins/algorithms/ExportExperimentLog.py | 1 -
.../PythonInterface/plugins/algorithms/ExportGeometry.py | 1 -
.../plugins/algorithms/ExportSampleLogsToCSVFile.py | 1 -
.../plugins/algorithms/ExportSampleLogsToHDF5.py | 1 -
.../PythonInterface/plugins/algorithms/ExportSpectraMask.py | 1 -
.../PythonInterface/plugins/algorithms/ExtractMonitors.py | 1 -
.../PythonInterface/plugins/algorithms/FilterLogByTime.py | 1 -
Framework/PythonInterface/plugins/algorithms/FitGaussian.py | 1 -
.../plugins/algorithms/GSASIIRefineFitPeaks.py | 1 -
.../plugins/algorithms/GenerateGroupingSNSInelastic.py | 1 -
Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py | 1 -
Framework/PythonInterface/plugins/algorithms/GetIPTS.py | 1 -
.../plugins/algorithms/GetLiveInstrumentValue.py | 2 --
Framework/PythonInterface/plugins/algorithms/HB2AReduce.py | 1 -
.../plugins/algorithms/HFIRSANS2Wavelength.py | 1 -
.../plugins/algorithms/IndirectTransmission.py | 1 -
.../plugins/algorithms/IntegratePeaksProfileFitting.py | 1 -
.../PythonInterface/plugins/algorithms/LRAutoReduction.py | 1 -
.../PythonInterface/plugins/algorithms/LRDirectBeamSort.py | 1 -
.../PythonInterface/plugins/algorithms/LRPeakSelection.py | 1 -
.../PythonInterface/plugins/algorithms/LRPrimaryFraction.py | 1 -
.../plugins/algorithms/LRReflectivityOutput.py | 1 -
.../PythonInterface/plugins/algorithms/LRScalingFactors.py | 1 -
.../plugins/algorithms/LRSubtractAverageBackground.py | 1 -
.../plugins/algorithms/LiquidsReflectometryReduction.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py | 2 --
Framework/PythonInterface/plugins/algorithms/LoadCIF.py | 1 -
.../PythonInterface/plugins/algorithms/LoadDNSLegacy.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadEXED.py | 1 -
.../PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py | 1 -
.../PythonInterface/plugins/algorithms/LoadFullprofFile.py | 2 --
.../PythonInterface/plugins/algorithms/LoadGudrunOutput.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadLamp.py | 1 -
.../plugins/algorithms/LoadLogPropertyTable.py | 1 -
.../PythonInterface/plugins/algorithms/LoadMultipleGSS.py | 1 -
.../PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py | 1 -
.../PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py | 1 -
.../plugins/algorithms/LoadNMoldyn4Ascii1D.py | 1 -
.../PythonInterface/plugins/algorithms/LoadPreNexusLive.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadSINQ.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py | 1 -
.../plugins/algorithms/LoadVisionElasticBS.py | 1 -
.../plugins/algorithms/LoadVisionElasticEQ.py | 1 -
.../plugins/algorithms/LoadVisionInelastic.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py | 1 -
.../plugins/algorithms/MRFilterCrossSections.py | 1 -
Framework/PythonInterface/plugins/algorithms/MRGetTheta.py | 1 -
.../PythonInterface/plugins/algorithms/MRInspectData.py | 1 -
.../plugins/algorithms/MagnetismReflectometryReduction.py | 1 -
Framework/PythonInterface/plugins/algorithms/MaskAngle.py | 1 -
Framework/PythonInterface/plugins/algorithms/MaskBTP.py | 1 -
.../plugins/algorithms/MaskWorkspaceToCalFile.py | 1 -
Framework/PythonInterface/plugins/algorithms/MatchPeaks.py | 1 -
Framework/PythonInterface/plugins/algorithms/MatchSpectra.py | 1 -
Framework/PythonInterface/plugins/algorithms/Mean.py | 2 --
.../PythonInterface/plugins/algorithms/MedianBinWidth.py | 2 --
.../PythonInterface/plugins/algorithms/MergeCalFiles.py | 1 -
Framework/PythonInterface/plugins/algorithms/MuonMaxent.py | 1 -
Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py | 1 -
.../PythonInterface/plugins/algorithms/NormaliseSpectra.py | 1 -
.../PythonInterface/plugins/algorithms/PDConvertRealSpace.py | 2 --
.../plugins/algorithms/PDConvertReciprocalSpace.py | 2 --
Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py | 1 -
Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py | 1 -
.../PythonInterface/plugins/algorithms/PearlMCAbsorption.py | 1 -
.../plugins/algorithms/PoldiCreatePeaksFromFile.py | 2 --
.../PythonInterface/plugins/algorithms/PoldiLoadRuns.py | 2 --
Framework/PythonInterface/plugins/algorithms/PoldiMerge.py | 1 -
.../plugins/algorithms/RefinePowderDiffProfileSeq.py | 2 --
.../plugins/algorithms/ReflectometryReductionOneLiveData.py | 2 --
.../plugins/algorithms/ReflectometrySliceEventWorkspace.py | 1 -
Framework/PythonInterface/plugins/algorithms/ResNorm.py | 1 -
.../PythonInterface/plugins/algorithms/RetrieveRunInfo.py | 1 -
Framework/PythonInterface/plugins/algorithms/SANSSubtract.py | 1 -
.../plugins/algorithms/SANSWideAngleCorrection.py | 1 -
Framework/PythonInterface/plugins/algorithms/SNAPReduce.py | 1 -
.../PythonInterface/plugins/algorithms/SNSPowderReduction.py | 1 -
.../plugins/algorithms/SaveGEMMAUDParamFile.py | 2 --
Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py | 1 -
.../PythonInterface/plugins/algorithms/SavePlot1DAsJson.py | 1 -
.../PythonInterface/plugins/algorithms/SaveReflections.py | 2 --
.../plugins/algorithms/SelectNexusFilesByMetadata.py | 2 --
Framework/PythonInterface/plugins/algorithms/SetDetScale.py | 2 --
.../PythonInterface/plugins/algorithms/SortByQVectors.py | 1 -
.../PythonInterface/plugins/algorithms/SortDetectors.py | 1 -
.../plugins/algorithms/StatisticsOfTableWorkspace.py | 2 --
Framework/PythonInterface/plugins/algorithms/StringToPng.py | 1 -
.../PythonInterface/plugins/algorithms/SuggestTibCNCS.py | 1 -
.../PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py | 2 --
Framework/PythonInterface/plugins/algorithms/Symmetrise.py | 2 --
.../plugins/algorithms/TOFTOFCropWorkspace.py | 2 --
.../PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py | 2 --
.../plugins/algorithms/TestWorkspaceGroupProperty.py | 2 --
.../PythonInterface/plugins/algorithms/USANSSimulation.py | 2 --
.../plugins/algorithms/UpdatePeakParameterTableValue.py | 1 -
.../plugins/algorithms/VelocityAutoCorrelations.py | 1 -
.../plugins/algorithms/VelocityCrossCorrelations.py | 1 -
.../PythonInterface/plugins/algorithms/VesuvioCorrections.py | 1 -
.../PythonInterface/plugins/algorithms/VesuvioPreFit.py | 2 --
.../PythonInterface/plugins/algorithms/VesuvioResolution.py | 2 --
.../PythonInterface/plugins/algorithms/VesuvioTOFFit.py | 2 --
.../PythonInterface/plugins/algorithms/VesuvioThickness.py | 2 --
Framework/PythonInterface/plugins/algorithms/ViewBOA.py | 2 --
.../PythonInterface/plugins/algorithms/VisionReduction.py | 2 --
.../algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py | 2 --
.../WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/BayesStretch.py | 1 -
.../WorkflowAlgorithms/CalculateMonteCarloAbsorption.py | 2 --
.../ConvertMultipleRunsToSingleCrystalMD.py | 2 --
.../algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py | 2 --
.../WorkflowAlgorithms/DirectILLApplySelfShielding.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILLCollectData.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py | 2 --
.../WorkflowAlgorithms/DirectILLIntegrateVanadium.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILLReduction.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILL_common.py | 2 --
.../WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py | 2 --
.../WorkflowAlgorithms/EQSANSDirectBeamTransmission.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py | 2 --
.../algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py | 2 --
.../algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py | 2 --
.../algorithms/WorkflowAlgorithms/FitGaussianPeaks.py | 2 --
.../WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py | 1 -
.../algorithms/WorkflowAlgorithms/HFIRSANSReduction.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py | 2 --
.../WorkflowAlgorithms/ISISIndirectDiffractionReduction.py | 2 --
.../WorkflowAlgorithms/ISISIndirectEnergyTransfer.py | 2 --
.../WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py | 2 --
.../WorkflowAlgorithms/IndirectAnnulusAbsorption.py | 2 --
.../WorkflowAlgorithms/IndirectAnnulusAbsorption2.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectCalibration.py | 2 --
.../WorkflowAlgorithms/IndirectCylinderAbsorption.py | 2 --
.../WorkflowAlgorithms/IndirectCylinderAbsorption2.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectDiffScan.py | 1 -
.../WorkflowAlgorithms/IndirectFlatPlateAbsorption.py | 2 --
.../WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py | 2 --
.../WorkflowAlgorithms/IndirectILLEnergyTransfer.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py | 2 --
.../WorkflowAlgorithms/IndirectILLReductionQENS.py | 2 --
.../WorkflowAlgorithms/IndirectReplaceFitResult.py | 1 -
.../algorithms/WorkflowAlgorithms/IndirectResolution.py | 2 --
.../WorkflowAlgorithms/IndirectTransmissionMonitor.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py | 2 --
.../WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/MSDFit.py | 1 -
.../algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/MolDyn.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/MuscatData.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py | 2 --
.../algorithms/WorkflowAlgorithms/NormaliseByThickness.py | 2 --
.../WorkflowAlgorithms/OSIRISDiffractionReduction.py | 2 --
.../algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py | 2 --
.../algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py | 2 --
.../algorithms/WorkflowAlgorithms/PowderILLEfficiency.py | 2 --
.../algorithms/WorkflowAlgorithms/PowderILLParameterScan.py | 2 --
.../algorithms/WorkflowAlgorithms/ReactorSANSResolution.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLAutoProcess.py | 5 -----
.../WorkflowAlgorithms/ReflectometryILLConvertToQ.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLPolarizationCor.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLPreprocess.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLSumForeground.py | 2 --
.../algorithms/WorkflowAlgorithms/ReflectometryILL_common.py | 2 --
.../WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/ResNorm2.py | 2 --
.../WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py | 2 --
.../WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py | 2 --
.../SANS/SANSBeamCentreFinderMassMethod.py | 2 --
.../SANS/SANSConvertToWavelengthAndRebin.py | 2 --
.../SANS/SANSCreateAdjustmentWorkspaces.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py | 2 --
.../algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py | 2 --
.../WorkflowAlgorithms/SANS/SANSReductionCoreBase.py | 2 --
.../WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py | 2 --
.../WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py | 2 --
.../WorkflowAlgorithms/SANS/SANSSingleReduction.py | 2 --
.../WorkflowAlgorithms/SANS/SANSSingleReduction2.py | 2 --
.../WorkflowAlgorithms/SANS/SANSSingleReductionBase.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py | 2 --
.../WorkflowAlgorithms/SANSBeamSpreaderTransmission.py | 2 --
.../WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py | 2 --
.../WorkflowAlgorithms/SANSDirectBeamTransmission.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSFitShiftScale.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSILLIntegration.py | 1 -
.../algorithms/WorkflowAlgorithms/SANSILLReduction.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANSMask.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/SANSReduction.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANSStitch.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py | 1 -
.../WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py | 2 --
.../WorkflowAlgorithms/SimulatedDensityOfStates.py | 1 -
.../WorkflowAlgorithms/SingleCrystalDiffuseReduction.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SwapWidths.py | 2 --
.../algorithms/WorkflowAlgorithms/TOSCABankCorrection.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/TimeSlice.py | 2 --
.../WorkflowAlgorithms/TotScatCalculateSelfScattering.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py | 1 -
.../algorithms/WorkflowAlgorithms/TransmissionUtils.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/USANSReduction.py | 1 -
.../WorkflowAlgorithms/VesuvioDiffractionReduction.py | 1 -
Framework/PythonInterface/plugins/algorithms/dnsdata.py | 1 -
.../PythonInterface/plugins/algorithms/roundinghelper.py | 1 -
.../PythonInterface/plugins/functions/BivariateGaussian.py | 1 -
Framework/PythonInterface/plugins/functions/ChudleyElliot.py | 2 --
.../PythonInterface/plugins/functions/DSFinterp1DFit.py | 1 -
.../PythonInterface/plugins/functions/EISFDiffCylinder.py | 2 --
.../PythonInterface/plugins/functions/EISFDiffSphere.py | 2 --
.../PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py | 2 --
.../plugins/functions/Examples/Example1DFunction.py | 1 -
.../plugins/functions/Examples/ExamplePeakFunction.py | 1 -
Framework/PythonInterface/plugins/functions/FickDiffusion.py | 1 -
Framework/PythonInterface/plugins/functions/Guinier.py | 1 -
Framework/PythonInterface/plugins/functions/GuinierPorod.py | 1 -
Framework/PythonInterface/plugins/functions/HallRoss.py | 2 --
Framework/PythonInterface/plugins/functions/ICConvoluted.py | 1 -
Framework/PythonInterface/plugins/functions/Lorentz.py | 1 -
Framework/PythonInterface/plugins/functions/MsdGauss.py | 2 --
Framework/PythonInterface/plugins/functions/MsdPeters.py | 2 --
Framework/PythonInterface/plugins/functions/MsdYi.py | 1 -
Framework/PythonInterface/plugins/functions/Porod.py | 1 -
.../PythonInterface/plugins/functions/PrimStretchedExpFT.py | 1 -
.../PythonInterface/plugins/functions/StretchedExpFT.py | 1 -
.../plugins/functions/StretchedExpFTHelper.py | 1 -
Framework/PythonInterface/plugins/functions/TeixeiraWater.py | 2 --
.../PythonInterface/test/python/mantid/FitFunctionsTest.py | 2 --
.../PythonInterface/test/python/mantid/ImportModuleTest.py | 2 --
Framework/PythonInterface/test/python/mantid/PVPythonTest.py | 1 -
.../PythonInterface/test/python/mantid/SimpleAPIFitTest.py | 2 --
.../PythonInterface/test/python/mantid/SimpleAPILoadTest.py | 2 --
.../test/python/mantid/SimpleAPIRenameWorkspaceTest.py | 2 --
.../PythonInterface/test/python/mantid/SimpleAPITest.py | 2 --
.../test/python/mantid/_plugins/ProductFunctionTest.py | 2 --
.../test/python/mantid/api/AlgorithmFactoryObserverTest.py | 2 --
.../test/python/mantid/api/AlgorithmFactoryTest.py | 2 --
.../test/python/mantid/api/AlgorithmHistoryTest.py | 2 --
.../test/python/mantid/api/AlgorithmManagerTest.py | 2 --
.../test/python/mantid/api/AlgorithmPropertyTest.py | 2 --
.../PythonInterface/test/python/mantid/api/AlgorithmTest.py | 1 -
.../python/mantid/api/AnalysisDataServiceObserverTest.py | 2 --
.../test/python/mantid/api/AnalysisDataServiceTest.py | 2 --
Framework/PythonInterface/test/python/mantid/api/AxisTest.py | 2 --
.../test/python/mantid/api/CatalogManagerTest.py | 2 --
.../test/python/mantid/api/CompositeFunctionTest.py | 2 --
.../test/python/mantid/api/DataProcessorAlgorithmTest.py | 2 --
.../test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py | 2 --
.../test/python/mantid/api/ExperimentInfoTest.py | 2 --
.../PythonInterface/test/python/mantid/api/FileFinderTest.py | 2 --
.../test/python/mantid/api/FilePropertyTest.py | 2 --
.../test/python/mantid/api/FrameworkManagerTest.py | 2 --
.../test/python/mantid/api/FunctionFactoryTest.py | 2 --
.../test/python/mantid/api/FunctionPropertyTest.py | 2 --
.../test/python/mantid/api/IEventWorkspaceTest.py | 2 --
.../test/python/mantid/api/IFunction1DTest.py | 2 --
.../test/python/mantid/api/IMaskWorkspaceTest.py | 2 --
.../test/python/mantid/api/IPeakFunctionTest.py | 2 --
.../test/python/mantid/api/IPeaksWorkspaceTest.py | 2 --
.../test/python/mantid/api/ITableWorkspaceTest.py | 2 --
.../PythonInterface/test/python/mantid/api/JacobianTest.py | 2 --
.../test/python/mantid/api/MDEventWorkspaceTest.py | 2 --
.../PythonInterface/test/python/mantid/api/MDGeometryTest.py | 2 --
.../test/python/mantid/api/MDHistoWorkspaceTest.py | 2 --
.../test/python/mantid/api/MatrixWorkspaceTest.py | 2 --
.../test/python/mantid/api/MultipleExperimentInfos.py | 2 --
.../test/python/mantid/api/MultipleFilePropertyTest.py | 2 --
.../PythonInterface/test/python/mantid/api/ProgressTest.py | 2 --
.../PythonInterface/test/python/mantid/api/ProjectionTest.py | 2 --
.../python/mantid/api/PythonAlgorithmChildAlgCallTest.py | 2 --
.../test/python/mantid/api/PythonAlgorithmPropertiesTest.py | 2 --
.../test/python/mantid/api/PythonAlgorithmTraitsTest.py | 2 --
.../mantid/api/PythonAlgorithmWorkspacePropertyTest.py | 2 --
.../test/python/mantid/api/RunPythonScriptTest.py | 2 --
Framework/PythonInterface/test/python/mantid/api/RunTest.py | 2 --
.../PythonInterface/test/python/mantid/api/SampleTest.py | 2 --
.../test/python/mantid/api/SpectrumInfoTest.py | 2 --
.../test/python/mantid/api/WorkspaceBinaryOpsTest.py | 2 --
.../test/python/mantid/api/WorkspaceFactoryTest.py | 2 --
.../test/python/mantid/api/WorkspaceGroupTest.py | 2 --
.../test/python/mantid/api/WorkspaceHistoryTest.py | 2 --
.../test/python/mantid/api/WorkspacePropertiesTest.py | 2 --
.../PythonInterface/test/python/mantid/api/WorkspaceTest.py | 2 --
.../test/python/mantid/api/WorkspaceUnaryOpsTest.py | 2 --
.../test/python/mantid/api/WorkspaceValidatorsTest.py | 2 --
.../test/python/mantid/dataobjects/EventListTest.py | 2 --
.../test/python/mantid/dataobjects/Workspace2DPickleTest.py | 2 --
.../test/python/mantid/geometry/BoundingBoxTest.py | 2 --
.../test/python/mantid/geometry/CSGObjectTest.py | 2 --
.../test/python/mantid/geometry/ComponentInfoTest.py | 2 --
.../test/python/mantid/geometry/CrystalStructureTest.py | 2 --
.../test/python/mantid/geometry/DetectorInfoTest.py | 2 --
.../test/python/mantid/geometry/GoniometerTest.py | 2 --
.../PythonInterface/test/python/mantid/geometry/GroupTest.py | 2 --
.../test/python/mantid/geometry/IComponentTest.py | 2 --
.../test/python/mantid/geometry/InstrumentTest.py | 2 --
.../test/python/mantid/geometry/OrientedLatticeTest.py | 2 --
.../test/python/mantid/geometry/PeakShapeTest.py | 2 --
.../test/python/mantid/geometry/PointGroupTest.py | 2 --
.../test/python/mantid/geometry/RectangularDetectorTest.py | 2 --
.../test/python/mantid/geometry/ReferenceFrameTest.py | 2 --
.../test/python/mantid/geometry/ReflectionGeneratorTest.py | 2 --
.../test/python/mantid/geometry/SpaceGroupTest.py | 2 --
.../test/python/mantid/geometry/SymmetryElementTest.py | 2 --
.../test/python/mantid/geometry/SymmetryOperationTest.py | 2 --
.../test/python/mantid/geometry/UnitCellTest.py | 2 --
.../test/python/mantid/kernel/ArrayBoundedValidatorTest.py | 2 --
.../test/python/mantid/kernel/ArrayLengthValidatorTest.py | 2 --
.../python/mantid/kernel/ArrayOrderedPairsValidatorTest.py | 2 --
.../test/python/mantid/kernel/ArrayPropertyTest.py | 2 --
.../test/python/mantid/kernel/BoundedValidatorTest.py | 2 --
.../test/python/mantid/kernel/CompositeValidatorTest.py | 2 --
.../test/python/mantid/kernel/ConfigServiceTest.py | 2 --
.../test/python/mantid/kernel/DateAndTimeTest.py | 2 --
.../test/python/mantid/kernel/DeltaEModeTest.py | 2 --
.../test/python/mantid/kernel/EnabledWhenPropertyTest.py | 2 --
.../test/python/mantid/kernel/FacilityInfoTest.py | 2 --
.../python/mantid/kernel/FilteredTimeSeriesPropertyTest.py | 2 --
.../test/python/mantid/kernel/IPropertySettingsTest.py | 2 --
.../test/python/mantid/kernel/InstrumentInfoTest.py | 2 --
.../test/python/mantid/kernel/ListValidatorTest.py | 2 --
.../test/python/mantid/kernel/LiveListenerInfoTest.py | 2 --
.../test/python/mantid/kernel/LogFilterTest.py | 2 --
.../PythonInterface/test/python/mantid/kernel/LoggerTest.py | 2 --
.../test/python/mantid/kernel/MandatoryValidatorTest.py | 2 --
.../test/python/mantid/kernel/MaterialBuilderTest.py | 2 --
.../test/python/mantid/kernel/MemoryStatsTest.py | 2 --
.../test/python/mantid/kernel/NullValidatorTest.py | 2 --
.../test/python/mantid/kernel/OptionalBoolTest.py | 2 --
.../test/python/mantid/kernel/ProgressBaseTest.py | 2 --
.../test/python/mantid/kernel/PropertyHistoryTest.py | 2 --
.../python/mantid/kernel/PropertyManagerDataServiceTest.py | 2 --
.../test/python/mantid/kernel/PropertyManagerPropertyTest.py | 2 --
.../test/python/mantid/kernel/PropertyManagerTest.py | 2 --
.../test/python/mantid/kernel/PropertyWithValueTest.py | 2 --
.../test/python/mantid/kernel/PythonPluginsTest.py | 2 --
.../PythonInterface/test/python/mantid/kernel/QuatTest.py | 2 --
.../test/python/mantid/kernel/RebinParamsValidatorTest.py | 2 --
.../test/python/mantid/kernel/StatisticsTest.py | 2 --
.../test/python/mantid/kernel/StringContainsValidatorTest.py | 2 --
.../test/python/mantid/kernel/TimeSeriesPropertyTest.py | 2 --
.../test/python/mantid/kernel/UnitConversionTest.py | 2 --
.../test/python/mantid/kernel/UnitFactoryTest.py | 2 --
.../test/python/mantid/kernel/UnitLabelTest.py | 2 --
.../PythonInterface/test/python/mantid/kernel/UnitsTest.py | 2 --
.../test/python/mantid/kernel/UsageServiceTest.py | 2 --
.../PythonInterface/test/python/mantid/kernel/V3DTest.py | 2 --
.../PythonInterface/test/python/mantid/kernel/VMDTest.py | 2 --
.../test/python/mantid/kernel/VisibleWhenPropertyTest.py | 2 --
.../PythonInterface/test/python/mantid/plots/ScalesTest.py | 2 --
.../PythonInterface/test/python/mantid/plots/__init__.py | 1 -
.../test/python/mantid/plots/axesfunctions3DTest.py | 2 --
.../test/python/mantid/plots/axesfunctionsTest.py | 2 --
.../test/python/mantid/plots/datafunctionsTest.py | 2 --
.../test/python/mantid/plots/plots__init__Test.py | 2 --
.../python/plugins/algorithms/AbinsAdvancedParametersTest.py | 1 -
.../test/python/plugins/algorithms/AbinsBasicTest.py | 1 -
.../test/python/plugins/algorithms/AlignComponentsTest.py | 2 --
.../algorithms/AngularAutoCorrelationsSingleAxisTest.py | 2 --
.../plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py | 2 --
.../plugins/algorithms/ApplyDetectorScanEffCorrTest.py | 2 --
.../test/python/plugins/algorithms/BinWidthAtXTest.py | 2 --
.../plugins/algorithms/CalculateEfficiencyCorrectionTest.py | 2 --
.../test/python/plugins/algorithms/CalculateFluxTest.py | 2 --
.../plugins/algorithms/CalculateSampleTransmissionTest.py | 2 --
.../test/python/plugins/algorithms/CheckForSampleLogsTest.py | 2 --
.../test/python/plugins/algorithms/CleanFileCacheTest.py | 2 --
.../test/python/plugins/algorithms/CompareSampleLogsTest.py | 2 --
.../plugins/algorithms/ComputeCalibrationCoefVanTest.py | 2 --
.../python/plugins/algorithms/ComputeIncoherentDOSTest.py | 2 --
.../test/python/plugins/algorithms/ConjoinSpectraTest.py | 2 --
.../test/python/plugins/algorithms/CorrectLogTimesTest.py | 2 --
.../test/python/plugins/algorithms/CorrectTOFTest.py | 2 --
.../python/plugins/algorithms/CreateCacheFilenameTest.py | 2 --
.../python/plugins/algorithms/CreateLeBailFitInputTest.py | 2 --
.../test/python/plugins/algorithms/CreateWorkspaceTest.py | 2 --
.../python/plugins/algorithms/CropWorkspaceForMDNormTest.py | 2 --
.../python/plugins/algorithms/CropWorkspaceRaggedTest.py | 2 --
.../algorithms/CylinderPaalmanPingsCorrection2Test.py | 2 --
.../plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py | 2 --
.../python/plugins/algorithms/DNSFlippingRatioCorrTest.py | 2 --
.../test/python/plugins/algorithms/DNSMergeRunsTest.py | 2 --
.../test/python/plugins/algorithms/DSFinterpTest.py | 2 --
.../test/python/plugins/algorithms/DakotaChiSquaredTest.py | 2 --
.../test/python/plugins/algorithms/DeltaPDF3DTest.py | 2 --
.../test/python/plugins/algorithms/EnggCalibrateFullTest.py | 2 --
.../test/python/plugins/algorithms/EnggCalibrateTest.py | 2 --
.../test/python/plugins/algorithms/EnggFitPeaksTest.py | 2 --
.../python/plugins/algorithms/EnggFitTOFFromPeaksTest.py | 2 --
.../test/python/plugins/algorithms/EnggFocusTest.py | 2 --
.../plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py | 2 --
.../algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py | 2 --
.../python/plugins/algorithms/EnggVanadiumCorrectionsTest.py | 2 --
.../python/plugins/algorithms/ExportExperimentLogTest.py | 2 --
.../plugins/algorithms/ExportSampleLogsToCSVFileTest.py | 2 --
.../python/plugins/algorithms/ExportSampleLogsToHDF5Test.py | 2 --
.../test/python/plugins/algorithms/ExportSpectraMaskTest.py | 2 --
.../test/python/plugins/algorithms/ExtractMonitorsTest.py | 2 --
.../test/python/plugins/algorithms/FilterLogByTimeTest.py | 2 --
.../test/python/plugins/algorithms/FitGaussianTest.py | 2 --
.../python/plugins/algorithms/FitIncidentSpectrumTest.py | 2 --
.../test/python/plugins/algorithms/GetEiT0atSNSTest.py | 2 --
.../python/plugins/algorithms/HFIRSANS2WavelengthTest.py | 1 -
.../python/plugins/algorithms/IndirectTransmissionTest.py | 2 --
.../test/python/plugins/algorithms/LRPeakSelectionTest.py | 2 --
.../test/python/plugins/algorithms/LoadAndMergeTest.py | 2 --
.../test/python/plugins/algorithms/LoadCIFTest.py | 2 --
.../test/python/plugins/algorithms/LoadDNSLegacyTest.py | 2 --
.../test/python/plugins/algorithms/LoadEmptyVesuvioTest.py | 2 --
.../test/python/plugins/algorithms/LoadFullprofFileTest.py | 2 --
.../test/python/plugins/algorithms/LoadGudrunOutputTest.py | 1 -
.../test/python/plugins/algorithms/LoadLampTest.py | 1 -
.../test/python/plugins/algorithms/LoadLiveDataTest.py | 2 --
.../python/plugins/algorithms/LoadLogPropertyTableTest.py | 2 --
.../test/python/plugins/algorithms/LoadMultipleGSSTest.py | 2 --
.../test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py | 2 --
.../python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py | 2 --
.../test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py | 2 --
.../test/python/plugins/algorithms/MaskAngleTest.py | 2 --
.../test/python/plugins/algorithms/MaskBTPTest.py | 2 --
.../python/plugins/algorithms/MaskWorkspaceToCalFileTest.py | 2 --
.../test/python/plugins/algorithms/MatchPeaksTest.py | 2 --
.../test/python/plugins/algorithms/MatchSpectraTest.py | 2 --
.../test/python/plugins/algorithms/MeanTest.py | 2 --
.../test/python/plugins/algorithms/MedianBinWidthTest.py | 2 --
.../test/python/plugins/algorithms/MergeCalFilesTest.py | 2 --
.../test/python/plugins/algorithms/MuonMaxEntTest.py | 2 --
.../test/python/plugins/algorithms/MuscatSofQWTest.py | 2 --
.../test/python/plugins/algorithms/NormaliseSpectraTest.py | 2 --
.../plugins/algorithms/OptimizeCrystalPlacementByRunTest.py | 2 --
.../test/python/plugins/algorithms/PDConvertRealSpaceTest.py | 2 --
.../plugins/algorithms/PDConvertReciprocalSpaceTest.py | 2 --
.../plugins/algorithms/PoldiCreatePeaksFromFileTest.py | 2 --
.../test/python/plugins/algorithms/PoldiMergeTest.py | 2 --
.../algorithms/ReflectometryReductionOneLiveDataTest.py | 2 --
.../algorithms/ReflectometrySliceEventWorkspaceTest.py | 2 --
.../test/python/plugins/algorithms/RetrieveRunInfoTest.py | 2 --
.../test/python/plugins/algorithms/SANSSubtractTest.py | 2 --
.../python/plugins/algorithms/SANSWideAngleCorrectionTest.py | 2 --
.../python/plugins/algorithms/SaveGEMMAUDParamFileTest.py | 2 --
.../test/python/plugins/algorithms/SaveNexusPDTest.py | 2 --
.../test/python/plugins/algorithms/SavePlot1DAsJsonTest.py | 2 --
.../test/python/plugins/algorithms/SaveYDATest.py | 2 --
.../plugins/algorithms/SelectNexusFilesByMetadataTest.py | 2 --
.../test/python/plugins/algorithms/SetDetScaleTest.py | 2 --
.../test/python/plugins/algorithms/SortByQVectorsTest.py | 2 --
.../test/python/plugins/algorithms/SortDetectorsTest.py | 2 --
.../plugins/algorithms/StatisticsOfTableWorkspaceTest.py | 2 --
.../test/python/plugins/algorithms/StringToPngTest.py | 2 --
.../test/python/plugins/algorithms/SuggestTibCNCSTest.py | 2 --
.../test/python/plugins/algorithms/SuggestTibHYSPECTest.py | 2 --
.../test/python/plugins/algorithms/SymmetriseTest.py | 2 --
.../python/plugins/algorithms/TOFTOFCropWorkspaceTest.py | 2 --
.../test/python/plugins/algorithms/TOFTOFMergeRunsTest.py | 2 --
.../plugins/algorithms/UpdatePeakParameterTableValueTest.py | 2 --
.../plugins/algorithms/VelocityAutoCorrelationsTest.py | 2 --
.../plugins/algorithms/VelocityCrossCorrelationsTest.py | 2 --
.../test/python/plugins/algorithms/VesuvioPreFitTest.py | 1 -
.../test/python/plugins/algorithms/VesuvioResolutionTest.py | 2 --
.../test/python/plugins/algorithms/VesuvioTOFFitTest.py | 1 -
.../test/python/plugins/algorithms/VesuvioThicknessTest.py | 2 --
.../WorkflowAlgorithms/AddSampleLogMultipleTest.py | 2 --
.../WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py | 2 --
.../algorithms/WorkflowAlgorithms/BayesStretchTest.py | 2 --
.../WorkflowAlgorithms/DetectorFloodWeightingTest.py | 2 --
.../WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py | 2 --
.../WorkflowAlgorithms/DirectILLCollectDataTest.py | 2 --
.../WorkflowAlgorithms/DirectILLDiagnosticsTest.py | 2 --
.../WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py | 2 --
.../algorithms/WorkflowAlgorithms/DirectILLReductionTest.py | 2 --
.../WorkflowAlgorithms/DirectILLSelfShieldingTest.py | 2 --
.../algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py | 2 --
.../algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py | 2 --
.../FlatPlatePaalmanPingsCorrectionTest.py | 2 --
.../ISISIndirectDiffractionReductionTest.py | 2 --
.../WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py | 2 --
.../ISISIndirectEnergyTransferWrapperTest.py | 2 --
.../WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py | 2 --
.../WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py | 2 --
.../WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py | 2 --
.../WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py | 2 --
.../WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py | 2 --
.../WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py | 2 --
.../WorkflowAlgorithms/IndirectILLEnergyTransferTest.py | 2 --
.../WorkflowAlgorithms/IndirectILLReductionFWSTest.py | 2 --
.../WorkflowAlgorithms/IndirectILLReductionQENSTest.py | 2 --
.../WorkflowAlgorithms/IndirectReplaceFitResultTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectResolutionTest.py | 2 --
.../WorkflowAlgorithms/IndirectSampleChangerTest.py | 2 --
.../WorkflowAlgorithms/IndirectTransmissionMonitorTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py | 2 --
.../algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py | 2 --
.../WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py | 2 --
.../WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/MolDynTest.py | 2 --
.../WorkflowAlgorithms/OSIRISDiffractionReductionTest.py | 2 --
.../WorkflowAlgorithms/PowderILLDetectorScanTest.py | 2 --
.../WorkflowAlgorithms/PowderILLParameterScanTest.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLConvertToQTest.py | 2 --
.../ReflectometryILLPolarizationCorTest.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLPreprocessTest.py | 2 --
.../WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py | 2 --
.../WorkflowAlgorithms/ReflectometryILL_commonTest.py | 2 --
.../ReflectometryISISLoadAndProcessTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py | 2 --
.../SANSDarkRunBackgroundCorrectionTest.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py | 2 --
.../algorithms/WorkflowAlgorithms/SANSILLReductionTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py | 2 --
.../algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py | 1 -
.../SimpleShapeMonteCarloAbsorptionTest.py | 2 --
.../WorkflowAlgorithms/SimulatedDensityOfStatesTest.py | 2 --
.../algorithms/WorkflowAlgorithms/SofQWMomentsTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py | 2 --
.../algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py | 2 --
.../WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py | 2 --
.../algorithms/WorkflowAlgorithms/TransformToIqtTest.py | 2 --
.../WorkflowAlgorithms/VesuvioDiffractionReductionTest.py | 2 --
.../sans/SANSConvertToWavelengthAndRebinTest.py | 1 -
.../test/python/plugins/functions/AFM_LFTest.py | 2 --
.../test/python/plugins/functions/AFM_ZFTest.py | 2 --
.../test/python/plugins/functions/AttributeTest.py | 2 --
.../test/python/plugins/functions/BesselTest.py | 2 --
.../test/python/plugins/functions/ChudleyElliotTest.py | 2 --
.../test/python/plugins/functions/CombGaussLorentzKTTest.py | 2 --
.../test/python/plugins/functions/CompositePCRmagnetTest.py | 2 --
.../test/python/plugins/functions/DSFinterp1DFitTest.py | 2 --
.../test/python/plugins/functions/DampedBesselTest.py | 2 --
.../test/python/plugins/functions/EISFDiffCylinderTest.py | 2 --
.../test/python/plugins/functions/EISFDiffSphereAlkylTest.py | 2 --
.../test/python/plugins/functions/EISFDiffSphereTest.py | 2 --
.../test/python/plugins/functions/Example1DFunctionTest.py | 2 --
.../test/python/plugins/functions/ExamplePeakFunctionTest.py | 2 --
.../test/python/plugins/functions/FmuFTest.py | 2 --
.../test/python/plugins/functions/GauBroadGauKTTest.py | 2 --
.../test/python/plugins/functions/GaussBesselTest.py | 2 --
.../test/python/plugins/functions/HighTFMuoniumTest.py | 2 --
.../test/python/plugins/functions/LowTFMuoniumTest.py | 2 --
.../test/python/plugins/functions/MeierTest.py | 2 --
.../test/python/plugins/functions/ModOscTest.py | 2 --
.../test/python/plugins/functions/MsdGaussTest.py | 2 --
.../test/python/plugins/functions/MsdPetersTest.py | 2 --
.../test/python/plugins/functions/MsdYiTest.py | 2 --
.../PythonInterface/test/python/plugins/functions/MuHTest.py | 2 --
.../test/python/plugins/functions/MuMinusExpTFTest.py | 2 --
.../test/python/plugins/functions/PCRmagnetRedfieldTest.py | 2 --
.../test/python/plugins/functions/PCRmagnetTest.py | 2 --
.../test/python/plugins/functions/PCRmagnetZFKTTest.py | 2 --
.../test/python/plugins/functions/PCRmagnetfnormTest.py | 2 --
.../test/python/plugins/functions/PrimStretchedExpFTTest.py | 1 -
.../test/python/plugins/functions/RFresonanceTest.py | 2 --
.../test/python/plugins/functions/RedfieldTest.py | 2 --
.../test/python/plugins/functions/SpinGlassTest.py | 2 --
.../test/python/plugins/functions/StandardSCTest.py | 2 --
.../test/python/plugins/functions/StaticLorentzianKTTest.py | 2 --
.../test/python/plugins/functions/StretchedExpFTTest.py | 1 -
.../python/plugins/functions/StretchedExpFTTestHelper.py | 2 --
.../test/python/plugins/functions/StretchedKTTest.py | 2 --
.../test/python/plugins/functions/TFMuoniumTest.py | 2 --
.../test/python/plugins/functions/TeixeiraWaterTest.py | 2 --
.../test/python/plugins/functions/ZFMuoniumTest.py | 2 --
.../test/python/plugins/functions/ZFdipoleTest.py | 2 --
.../test/python/plugins/functions/ZFelectronDipoleTest.py | 2 --
.../test/python/plugins/functions/ZFprotonDipoleTest.py | 2 --
Framework/PythonInterface/test/testhelpers/__init__.py | 3 +--
.../PythonInterface/test/testhelpers/algorithm_decorator.py | 2 --
Framework/PythonInterface/test/testhelpers/illhelpers.py | 2 --
Framework/PythonInterface/test/testhelpers/mlzhelpers.py | 2 --
.../PythonInterface/test/testhelpers/tempfile_wrapper.py | 2 --
Framework/PythonInterface/test/testhelpers/testrunner.py | 2 --
MantidPlot/ipython_widget/__init__.py | 3 +--
MantidPlot/ipython_widget/mantid_ipython_widget.py | 3 +--
MantidPlot/mantidplot.py | 3 +--
MantidPlot/pymantidplot/__init__.py | 3 +--
MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py | 3 +--
MantidPlot/pymantidplot/proxies.py | 3 +--
MantidPlot/pymantidplot/qtiplot.py | 3 +--
MantidPlot/test/MantidPlotInputArgsCheck.py | 1 -
MantidPlot/test/mantidplottests.py | 1 -
Testing/PerformanceTests/analysis_mpl.py | 2 --
Testing/PerformanceTests/sqlresults.py | 1 -
Testing/SystemTests/lib/systemtests/systemtesting.py | 2 --
Testing/SystemTests/lib/systemtests/xmlreporter.py | 1 -
Testing/SystemTests/scripts/InstallerTests.py | 1 -
Testing/SystemTests/scripts/mantidinstaller.py | 1 -
Testing/SystemTests/scripts/performance/analysis.py | 1 -
Testing/SystemTests/scripts/performance/sqlresults.py | 1 -
Testing/SystemTests/scripts/runSystemTests.py | 2 --
Testing/SystemTests/tests/analysis/AbinsTest.py | 1 -
Testing/SystemTests/tests/analysis/BASISTest.py | 2 --
.../SystemTests/tests/analysis/BilbySANSDataProcessorTest.py | 1 -
Testing/SystemTests/tests/analysis/BuildSQWTest.py | 1 -
Testing/SystemTests/tests/analysis/CRISPLoadingTest.py | 1 -
.../tests/analysis/CalibrateRectangularDetector_Test.py | 1 -
Testing/SystemTests/tests/analysis/CodeConventions.py | 1 -
Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py | 1 -
Testing/SystemTests/tests/analysis/CountReflectionsTest.py | 1 -
Testing/SystemTests/tests/analysis/DOSTest.py | 1 -
.../SystemTests/tests/analysis/Diffraction_Workflow_Test.py | 1 -
.../SystemTests/tests/analysis/DirectInelasticDiagnostic2.py | 1 -
Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py | 1 -
Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py | 1 -
Testing/SystemTests/tests/analysis/EnginXScriptTest.py | 1 -
.../SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py | 1 -
Testing/SystemTests/tests/analysis/GUIStartupTest.py | 1 -
Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py | 1 -
.../tests/analysis/ILLDetectorEfficiencyCorUserTest.py | 2 --
.../tests/analysis/ILLDirectGeometryReductionTest.py | 2 --
.../SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py | 2 --
.../SystemTests/tests/analysis/ILLPowderDetectorScanTest.py | 2 --
.../tests/analysis/ILLPowderEfficiencyClosureTest.py | 2 --
.../SystemTests/tests/analysis/ILLPowderEfficiencyTest.py | 2 --
.../SystemTests/tests/analysis/ILLPowderParameterScanTest.py | 2 --
Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py | 2 --
Testing/SystemTests/tests/analysis/ISISDirectInelastic.py | 1 -
.../tests/analysis/ISISDirectReductionComponents.py | 1 -
Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py | 2 --
Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py | 1 -
.../SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py | 1 -
.../SystemTests/tests/analysis/ISISIndirectSimulationTest.py | 1 -
Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py | 1 -
.../SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py | 1 -
.../SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py | 1 -
.../tests/analysis/ISISReflectometryWorkflowBase.py | 1 -
Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py | 2 --
Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py | 2 --
Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py | 2 --
Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py | 2 --
.../SystemTests/tests/analysis/IndirectDiffractionTests.py | 2 --
Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py | 2 --
Testing/SystemTests/tests/analysis/LinkedUBs_Test.py | 1 -
Testing/SystemTests/tests/analysis/LoadAndCheckBase.py | 1 -
Testing/SystemTests/tests/analysis/LoadExedTest.py | 1 -
Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py | 1 -
Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py | 1 -
Testing/SystemTests/tests/analysis/LoadVesuvioTest.py | 1 -
Testing/SystemTests/tests/analysis/MDWorkspaceTests.py | 1 -
.../tests/analysis/POLDICreatePeaksFromCellTest.py | 1 -
Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py | 1 -
Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py | 1 -
Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py | 1 -
.../tests/analysis/PowderDiffProfileCalibrateTest.py | 1 -
.../tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py | 1 -
Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py | 1 -
Testing/SystemTests/tests/analysis/ReflectometryISIS.py | 1 -
.../SystemTests/tests/analysis/ReuseExistingCalibration.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DBatch.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py | 1 -
.../SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py | 1 -
.../SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py | 1 -
.../SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py | 1 -
.../tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py | 2 --
Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py | 1 -
.../SystemTests/tests/analysis/SANS2DReductionGUIAdded.py | 1 -
.../tests/analysis/SANS2DReductionGUIAddedTest_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DSlicing.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DWaveloops.py | 1 -
Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py | 2 --
.../tests/analysis/SANSBeamCentreFinderCoreTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSCentreSample.py | 1 -
.../SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSFileChecking.py | 1 -
.../SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py | 2 --
Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py | 2 --
Testing/SystemTests/tests/analysis/SANSILLReductionTest.py | 2 --
Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQBatch.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQCan2D.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py | 1 -
.../SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py | 1 -
.../SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py | 1 -
Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANSLoadTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSLoadersTest.py | 1 -
.../SystemTests/tests/analysis/SANSMergedDetectorsTest.py | 1 -
.../SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py | 1 -
Testing/SystemTests/tests/analysis/SANSQResolutionTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSSaveTest.py | 1 -
.../SystemTests/tests/analysis/SANSSingleReductionTest.py | 2 --
Testing/SystemTests/tests/analysis/SANSUtilityTest.py | 1 -
Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py | 1 -
Testing/SystemTests/tests/analysis/SEQUOIAreduction.py | 1 -
Testing/SystemTests/tests/analysis/SNAPRedux.py | 1 -
Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py | 1 -
Testing/SystemTests/tests/analysis/SXDAnalysis.py | 1 -
Testing/SystemTests/tests/analysis/SaveNexusTest.py | 1 -
Testing/SystemTests/tests/analysis/SortHKLTest.py | 1 -
Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py | 1 -
.../tests/analysis/SpaceGroupReflectionConditionsTest.py | 1 -
Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py | 1 -
Testing/SystemTests/tests/analysis/SphinxWarnings.py | 1 -
Testing/SystemTests/tests/analysis/SurfLoadingTest.py | 1 -
Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py | 1 -
Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py | 2 --
Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py | 1 -
Testing/SystemTests/tests/analysis/WishCalibrate.py | 1 -
Testing/SystemTests/tests/analysis/WishMasking.py | 1 -
.../tests/analysis/complexShapeAbsorptionsTest.py | 1 -
buildconfig/class_maker.py | 2 --
buildconfig/cmakelists_utils.py | 2 --
buildconfig/delete_class.py | 2 --
buildconfig/move_class.py | 2 --
dev-docs/source/MVPTutorial/CompleteGUIcode/main.py | 1 -
.../source/MVPTutorial/CompleteGUIcode/master_presenter.py | 3 ---
dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py | 1 -
dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py | 3 ---
dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py | 1 -
.../source/MVPTutorial/CompleteGUIcode/plot_presenter.py | 3 ---
dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py | 1 -
dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py | 3 ---
dev-docs/source/MVPTutorial/CompleteGUIcode/view.py | 1 -
docs/sphinxext/mantiddoc/directives/algorithm.py | 1 -
docs/sphinxext/mantiddoc/directives/categories.py | 1 -
docs/sphinxext/mantiddoc/directives/diagram.py | 1 -
docs/sphinxext/mantiddoc/directives/properties.py | 1 -
docs/sphinxext/mantiddoc/directives/sourcelink.py | 2 --
qt/applications/workbench/workbench/app/mainwindow.py | 2 --
qt/applications/workbench/workbench/config/__init__.py | 2 --
qt/applications/workbench/workbench/config/fonts.py | 2 --
qt/applications/workbench/workbench/config/user.py | 3 +--
.../workbench/workbench/plotting/backend_workbench.py | 3 +--
qt/applications/workbench/workbench/plotting/config.py | 2 --
.../workbench/workbench/plotting/figureinteraction.py | 2 --
.../workbench/workbench/plotting/figuremanager.py | 2 --
.../workbench/plotting/plotscriptgenerator/__init__.py | 2 --
.../workbench/workbench/plotting/plotscriptgenerator/axes.py | 2 --
.../workbench/plotting/plotscriptgenerator/figure.py | 2 --
.../workbench/plotting/plotscriptgenerator/lines.py | 2 --
.../workbench/plotting/plotscriptgenerator/test/__init__.py | 1 -
.../plotscriptgenerator/test/test_plotscriptgeneratoraxes.py | 2 --
.../workbench/plotting/plotscriptgenerator/utils.py | 2 --
.../workbench/workbench/plotting/propertiesdialog.py | 2 --
.../workbench/plotting/test/test_figureerrorsmanager.py | 3 +--
.../workbench/plotting/test/test_figureinteraction.py | 3 +--
.../workbench/plotting/test/test_propertiesdialog.py | 3 +--
qt/applications/workbench/workbench/plotting/toolbar.py | 2 --
.../workbench/workbench/plugins/algorithmselectorwidget.py | 2 --
qt/applications/workbench/workbench/plugins/editor.py | 2 --
.../workbench/workbench/plugins/jupyterconsole.py | 2 --
.../workbench/workbench/plugins/logmessagedisplay.py | 2 --
.../workbench/workbench/plugins/plotselectorwidget.py | 2 --
.../workbench/workbench/plugins/test/test_jupyterconsole.py | 2 --
.../workbench/workbench/plugins/test/test_workspacewidget.py | 2 --
.../workbench/workbench/plugins/workspacewidget.py | 2 --
.../workbench/workbench/projectrecovery/projectrecovery.py | 2 --
.../workbench/projectrecovery/projectrecoveryloader.py | 2 --
.../workbench/projectrecovery/projectrecoverysaver.py | 2 --
.../projectrecovery/recoverygui/projectrecoverymodel.py | 2 --
.../projectrecovery/recoverygui/projectrecoverypresenter.py | 2 --
.../projectrecovery/recoverygui/projectrecoverywidgetview.py | 2 --
.../projectrecovery/recoverygui/recoveryfailureview.py | 2 --
.../recoverygui/test/test_projectrecoverymodel.py | 2 --
.../recoverygui/test/test_projectrecoverypresenter.py | 2 --
.../recoverygui/test/test_projectrecoverywidgetview.py | 2 --
.../recoverygui/test/test_recoveryfailureview.py | 2 --
.../workbench/projectrecovery/test/test_projectrecovery.py | 2 --
.../projectrecovery/test/test_projectrecoveryloader.py | 2 --
.../projectrecovery/test/test_projectrecoverysaver.py | 2 --
qt/applications/workbench/workbench/test/mainwindowtest.py | 2 --
qt/applications/workbench/workbench/test/test_import.py | 3 +--
.../workbench/workbench/utils/test/windowfindertest.py | 2 --
qt/applications/workbench/workbench/utils/windowfinder.py | 2 --
.../workbench/workbench/widgets/settings/presenter.py | 2 --
qt/python/mantidqt/MPLwidgets.py | 1 -
qt/python/mantidqt/algorithminputhistory.py | 2 --
qt/python/mantidqt/dialogs/algorithmdialog.py | 2 --
qt/python/mantidqt/dialogs/genericdialog.py | 2 --
qt/python/mantidqt/dialogs/spectraselectordialog.py | 2 --
qt/python/mantidqt/dialogs/test/__init__.py | 1 -
qt/python/mantidqt/gui_helper.py | 1 -
qt/python/mantidqt/hint.py | 2 --
qt/python/mantidqt/icons/__init__.py | 2 --
qt/python/mantidqt/icons/test/test_icons.py | 2 --
qt/python/mantidqt/interfacemanager.py | 2 --
qt/python/mantidqt/project/basedecoder.py | 2 --
qt/python/mantidqt/project/baseencoder.py | 2 --
qt/python/mantidqt/project/decoderfactory.py | 2 --
qt/python/mantidqt/project/encoderfactory.py | 2 --
qt/python/mantidqt/project/plotsloader.py | 2 --
qt/python/mantidqt/project/plotssaver.py | 2 --
qt/python/mantidqt/project/project.py | 2 --
qt/python/mantidqt/project/projectloader.py | 2 --
qt/python/mantidqt/project/projectsaver.py | 2 --
qt/python/mantidqt/project/test/test_decoderfactory.py | 2 --
qt/python/mantidqt/project/test/test_encoderfactory.py | 2 --
qt/python/mantidqt/project/test/test_plotsloader.py | 2 --
qt/python/mantidqt/project/test/test_plotssaver.py | 2 --
qt/python/mantidqt/project/test/test_project.py | 2 --
qt/python/mantidqt/project/workspaceloader.py | 2 --
qt/python/mantidqt/project/workspacesaver.py | 2 --
qt/python/mantidqt/test/test_import.py | 3 +--
qt/python/mantidqt/usersubwindow.py | 2 --
qt/python/mantidqt/usersubwindowfactory.py | 2 --
qt/python/mantidqt/utils/asynchronous.py | 2 --
qt/python/mantidqt/utils/observer_pattern.py | 1 -
qt/python/mantidqt/utils/test/test_modal_tester.py | 3 +--
qt/python/mantidqt/utils/test/test_qt_utils.py | 3 +--
qt/python/mantidqt/utils/test/test_writetosignal.py | 2 --
qt/python/mantidqt/utils/testing/mocks/mock_mantid.py | 2 --
.../utils/testing/mocks/mock_matrixworkspacedisplay.py | 2 --
qt/python/mantidqt/utils/testing/mocks/mock_observing.py | 2 --
qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py | 3 ---
qt/python/mantidqt/utils/testing/mocks/mock_qt.py | 2 --
qt/python/mantidqt/utils/writetosignal.py | 2 --
qt/python/mantidqt/widgets/codeeditor/completion.py | 2 --
qt/python/mantidqt/widgets/codeeditor/editor.py | 2 --
qt/python/mantidqt/widgets/codeeditor/errorformatter.py | 2 --
qt/python/mantidqt/widgets/codeeditor/interpreter.py | 2 --
.../mantidqt/widgets/codeeditor/multifileinterpreter.py | 2 --
.../mantidqt/widgets/codeeditor/test/test_codeeditor.py | 2 --
.../mantidqt/widgets/codeeditor/test/test_completion.py | 2 --
.../mantidqt/widgets/codeeditor/test/test_errorformatter.py | 2 --
qt/python/mantidqt/widgets/codeeditor/test/test_execution.py | 2 --
.../mantidqt/widgets/codeeditor/test/test_interpreter.py | 2 --
.../widgets/codeeditor/test/test_interpreter_view.py | 2 --
.../widgets/codeeditor/test/test_multifileinterpreter.py | 2 --
.../codeeditor/test/test_multifileinterpreter_view.py | 2 --
qt/python/mantidqt/widgets/colorbar/colorbar.py | 2 --
.../widgets/embedded_find_replace_dialog/presenter.py | 2 --
.../test/test_embedded_find_replace_dialog_presenter.py | 2 --
qt/python/mantidqt/widgets/filefinder/__init__.py | 2 --
.../fitpropertybrowser/addfunctiondialog/presenter.py | 2 --
.../widgets/fitpropertybrowser/addfunctiondialog/view.py | 2 --
.../widgets/fitpropertybrowser/fitpropertybrowser.py | 2 --
.../mantidqt/widgets/fitpropertybrowser/interactive_tool.py | 2 --
qt/python/mantidqt/widgets/instrumentview/__init__.py | 2 --
qt/python/mantidqt/widgets/instrumentview/io.py | 3 ---
qt/python/mantidqt/widgets/instrumentview/presenter.py | 2 --
.../widgets/instrumentview/test/test_instrumentview_io.py | 2 --
qt/python/mantidqt/widgets/instrumentview/view.py | 2 --
qt/python/mantidqt/widgets/jobtreeview/__init__.py | 2 --
qt/python/mantidqt/widgets/manageuserdirectories.py | 2 --
qt/python/mantidqt/widgets/messagedisplay.py | 2 --
qt/python/mantidqt/widgets/observers/ads_observer.py | 2 --
qt/python/mantidqt/widgets/observers/observing_presenter.py | 3 ---
qt/python/mantidqt/widgets/observers/observing_view.py | 3 ---
.../mantidqt/widgets/observers/test/test_ads_observer.py | 2 --
.../widgets/observers/test/test_observing_presenter.py | 2 --
.../mantidqt/widgets/observers/test/test_observing_view.py | 2 --
qt/python/mantidqt/widgets/plotconfigdialog/__init__.py | 2 --
.../widgets/plotconfigdialog/axestabwidget/__init__.py | 3 ---
.../widgets/plotconfigdialog/axestabwidget/presenter.py | 2 --
.../widgets/plotconfigdialog/axestabwidget/test/__init__.py | 1 -
.../axestabwidget/test/test_axestabwidgetpresenter.py | 2 --
.../mantidqt/widgets/plotconfigdialog/axestabwidget/view.py | 2 --
qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py | 2 --
.../widgets/plotconfigdialog/curvestabwidget/__init__.py | 2 --
.../curvestabwidget/errorbarstabwidget/__init__.py | 1 -
.../curvestabwidget/errorbarstabwidget/view.py | 2 --
.../curvestabwidget/linetabwidget/__init__.py | 1 -
.../plotconfigdialog/curvestabwidget/linetabwidget/view.py | 2 --
.../curvestabwidget/markertabwidget/__init__.py | 1 -
.../plotconfigdialog/curvestabwidget/markertabwidget/view.py | 2 --
.../widgets/plotconfigdialog/curvestabwidget/presenter.py | 2 --
.../plotconfigdialog/curvestabwidget/test/__init__.py | 1 -
.../curvestabwidget/test/test_curveproperties.py | 2 --
.../curvestabwidget/test/test_curvestabwidgetpresenter.py | 2 --
.../widgets/plotconfigdialog/curvestabwidget/view.py | 2 --
.../widgets/plotconfigdialog/imagestabwidget/__init__.py | 2 --
.../widgets/plotconfigdialog/imagestabwidget/presenter.py | 2 --
.../plotconfigdialog/imagestabwidget/test/__init__.py | 1 -
.../widgets/plotconfigdialog/imagestabwidget/view.py | 2 --
.../widgets/plotconfigdialog/legendtabwidget/__init__.py | 1 -
.../legendtabwidget/advancedlegendoptionsdialog/__init__.py | 1 -
.../legendtabwidget/advancedlegendoptionsdialog/view.py | 2 --
.../widgets/plotconfigdialog/legendtabwidget/presenter.py | 2 --
.../widgets/plotconfigdialog/legendtabwidget/view.py | 2 --
qt/python/mantidqt/widgets/plotconfigdialog/presenter.py | 2 --
qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py | 1 -
.../plotconfigdialog/test/test_plotconfigdialogpresenter.py | 2 --
qt/python/mantidqt/widgets/plotconfigdialog/view.py | 2 --
qt/python/mantidqt/widgets/samplelogs/model.py | 1 -
qt/python/mantidqt/widgets/samplelogs/presenter.py | 1 -
.../widgets/samplelogs/test/test_samplelogs_model.py | 2 --
.../widgets/samplelogs/test/test_samplelogs_presenter.py | 2 --
qt/python/mantidqt/widgets/samplelogs/view.py | 1 -
qt/python/mantidqt/widgets/scriptrepository.py | 2 --
qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py | 1 -
qt/python/mantidqt/widgets/sliceviewer/model.py | 1 -
qt/python/mantidqt/widgets/sliceviewer/presenter.py | 1 -
.../widgets/sliceviewer/test/test_sliceviewer_model.py | 2 --
.../widgets/sliceviewer/test/test_sliceviewer_presenter.py | 2 --
qt/python/mantidqt/widgets/sliceviewer/toolbar.py | 3 +--
qt/python/mantidqt/widgets/sliceviewer/view.py | 2 --
.../mantidqt/widgets/test/test_fitpropertybrowserbase.py | 1 -
qt/python/mantidqt/widgets/test/test_functionbrowser.py | 1 -
qt/python/mantidqt/widgets/test/test_jupyterconsole.py | 2 --
qt/python/mantidqt/widgets/test/test_messagedisplay.py | 3 +--
qt/python/mantidqt/widgets/test/test_scriptrepository.py | 3 +--
.../mantidqt/widgets/waterfallplotfillareadialog/__init__.py | 1 -
.../widgets/waterfallplotfillareadialog/presenter.py | 2 --
.../widgets/waterfallplotfillareadialog/test/__init__.py | 1 -
.../test/test_waterfallplotfillareadialogpresenter.py | 2 --
.../mantidqt/widgets/waterfallplotfillareadialog/view.py | 2 --
.../mantidqt/widgets/waterfallplotoffsetdialog/__init__.py | 1 -
.../mantidqt/widgets/waterfallplotoffsetdialog/presenter.py | 2 --
.../widgets/waterfallplotoffsetdialog/test/__init__.py | 1 -
.../test/test_waterfallplotoffsetdialogpresenter.py | 2 --
qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/__init__.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/data_copier.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py | 2 --
.../widgets/workspacedisplay/matrix/table_view_model.py | 2 --
.../matrix/test/test_matrixworkspacedisplay_model.py | 2 --
.../matrix/test/test_matrixworkspacedisplay_presenter.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/table/model.py | 2 --
.../table/test/test_tableworkspacedisplay_io.py | 2 --
.../table/test/test_tableworkspacedisplay_marked_columns.py | 2 --
.../table/test/test_tableworkspacedisplay_model.py | 2 --
.../table/test/test_tableworkspacedisplay_presenter.py | 2 --
.../table/test/test_tableworkspacedisplay_view.py | 2 --
...test_tableworkspacedisplay_workbench_table_widget_item.py | 2 --
qt/python/mantidqt/widgets/workspacedisplay/table/view.py | 2 --
.../widgets/workspacewidget/algorithmhistorywindow.py | 2 --
.../mantidqt/widgets/workspacewidget/mantidtreemodel.py | 2 --
.../mantidqt/widgets/workspacewidget/workspacetreewidget.py | 2 --
qt/widgets/common/test/MWRunFilesTest.py | 1 -
.../sliceviewer/test/SliceViewerPythonInterfaceTest.py | 1 -
scripts/AbinsModules/AbinsConstants.py | 1 -
scripts/AbinsModules/AbinsData.py | 1 -
scripts/AbinsModules/AbinsTestHelpers.py | 1 -
scripts/AbinsModules/AtomsData.py | 1 -
scripts/AbinsModules/CalculateDWSingleCrystal.py | 1 -
scripts/AbinsModules/CalculatePowder.py | 1 -
scripts/AbinsModules/CalculateS.py | 1 -
scripts/AbinsModules/CalculateSingleCrystal.py | 1 -
scripts/AbinsModules/DWSingleCrystalData.py | 1 -
scripts/AbinsModules/FrequencyPowderGenerator.py | 2 --
scripts/AbinsModules/GeneralAbInitioParser.py | 2 --
scripts/AbinsModules/GeneralAbInitioProgram.py | 1 -
scripts/AbinsModules/GeneralData.py | 3 ---
scripts/AbinsModules/GeneralLoadAbInitioTester.py | 1 -
scripts/AbinsModules/IOmodule.py | 1 -
scripts/AbinsModules/InstrumentProducer.py | 1 -
scripts/AbinsModules/Instruments/Broadening.py | 1 -
scripts/AbinsModules/Instruments/Instrument.py | 3 ---
scripts/AbinsModules/Instruments/ToscaInstrument.py | 2 --
scripts/AbinsModules/Instruments/__init__.py | 2 --
scripts/AbinsModules/KpointsData.py | 1 -
scripts/AbinsModules/LoadCASTEP.py | 1 -
scripts/AbinsModules/LoadCRYSTAL.py | 1 -
scripts/AbinsModules/LoadDMOL3.py | 1 -
scripts/AbinsModules/LoadGAUSSIAN.py | 1 -
scripts/AbinsModules/PowderData.py | 1 -
scripts/AbinsModules/SData.py | 1 -
scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py | 1 -
scripts/AbinsModules/SingleCrystalData.py | 1 -
scripts/AbinsModules/__init__.py | 3 ---
scripts/CrystalTools/PeakReport.py | 1 -
scripts/DGSPlanner.py | 1 -
scripts/DGSPlanner/ClassicUBInputWidget.py | 1 -
scripts/DGSPlanner/DGSPlannerGUI.py | 1 -
scripts/DGSPlanner/DimensionSelectorWidget.py | 1 -
scripts/DGSPlanner/InstrumentSetupWidget.py | 1 -
scripts/DGSPlanner/LoadNexusUB.py | 1 -
scripts/DGSPlanner/MatrixUBInputWidget.py | 1 -
scripts/DGSPlanner/ValidateOL.py | 1 -
scripts/DGS_Reduction.py | 1 -
scripts/DiamondAttenuationCorrection/FitTrans.py | 1 -
scripts/DiamondAttenuationCorrection/FitTransReadUB.py | 1 -
scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py | 1 -
scripts/Diffraction/isis_powder/__init__.py | 2 --
scripts/Diffraction/isis_powder/abstract_inst.py | 2 --
scripts/Diffraction/isis_powder/gem.py | 2 --
.../isis_powder/gem_routines/gem_advanced_config.py | 2 --
scripts/Diffraction/isis_powder/gem_routines/gem_algs.py | 2 --
.../isis_powder/gem_routines/gem_calibration_algs.py | 2 --
scripts/Diffraction/isis_powder/gem_routines/gem_enums.py | 3 ---
scripts/Diffraction/isis_powder/gem_routines/gem_output.py | 2 --
.../isis_powder/gem_routines/gem_param_mapping.py | 2 --
scripts/Diffraction/isis_powder/hrpd.py | 2 --
.../isis_powder/hrpd_routines/hrpd_advanced_config.py | 2 --
scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py | 2 --
scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py | 3 ---
.../isis_powder/hrpd_routines/hrpd_param_mapping.py | 2 --
scripts/Diffraction/isis_powder/pearl.py | 2 --
.../isis_powder/pearl_routines/pearl_advanced_config.py | 2 --
scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py | 2 --
.../isis_powder/pearl_routines/pearl_calibration_algs.py | 2 --
.../Diffraction/isis_powder/pearl_routines/pearl_enums.py | 3 ---
.../Diffraction/isis_powder/pearl_routines/pearl_output.py | 2 --
.../isis_powder/pearl_routines/pearl_param_mapping.py | 2 --
scripts/Diffraction/isis_powder/polaris.py | 1 -
.../isis_powder/polaris_routines/polaris_advanced_config.py | 2 --
.../Diffraction/isis_powder/polaris_routines/polaris_algs.py | 1 -
.../isis_powder/polaris_routines/polaris_enums.py | 3 ---
.../isis_powder/polaris_routines/polaris_param_mapping.py | 2 --
scripts/Diffraction/isis_powder/routines/__init__.py | 2 --
.../Diffraction/isis_powder/routines/absorb_corrections.py | 2 --
scripts/Diffraction/isis_powder/routines/calibrate.py | 2 --
scripts/Diffraction/isis_powder/routines/common.py | 1 -
scripts/Diffraction/isis_powder/routines/common_enums.py | 2 --
scripts/Diffraction/isis_powder/routines/common_output.py | 2 --
scripts/Diffraction/isis_powder/routines/focus.py | 1 -
.../Diffraction/isis_powder/routines/instrument_settings.py | 2 --
scripts/Diffraction/isis_powder/routines/param_map_entry.py | 2 --
scripts/Diffraction/isis_powder/routines/run_details.py | 2 --
scripts/Diffraction/isis_powder/routines/sample_details.py | 2 --
scripts/Diffraction/isis_powder/routines/yaml_parser.py | 2 --
scripts/Diffraction/isis_powder/routines/yaml_sanity.py | 3 ---
.../Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py | 2 --
.../isis_powder/test/ISISPowderAbstractInstrumentTest.py | 2 --
scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py | 2 --
.../Diffraction/isis_powder/test/ISISPowderFocusCropTest.py | 1 -
.../Diffraction/isis_powder/test/ISISPowderGemOutputTest.py | 2 --
.../isis_powder/test/ISISPowderInstrumentSettingsTest.py | 2 --
.../Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py | 2 --
.../isis_powder/test/ISISPowderSampleDetailsTest.py | 2 --
.../Diffraction/isis_powder/test/ISISPowderYamlParserTest.py | 2 --
scripts/Diffraction/wish/reduce.py | 1 -
scripts/Engineering/EnggUtils.py | 1 -
scripts/Engineering/EnginX.py | 2 --
.../gui/engineering_diffraction/engineering_diffraction.py | 1 -
.../gui/engineering_diffraction/settings/settings_helper.py | 2 --
.../gui/engineering_diffraction/settings/settings_model.py | 2 --
.../engineering_diffraction/settings/settings_presenter.py | 2 --
.../gui/engineering_diffraction/settings/settings_view.py | 1 -
.../settings/test/test_settings_helper.py | 2 --
.../settings/test/test_settings_model.py | 2 --
.../settings/test/test_settings_presenter.py | 2 --
.../gui/engineering_diffraction/tabs/calibration/model.py | 2 --
.../engineering_diffraction/tabs/calibration/presenter.py | 2 --
.../tabs/calibration/test/test_calib_model.py | 2 --
.../tabs/calibration/test/test_calib_presenter.py | 2 --
.../gui/engineering_diffraction/tabs/calibration/view.py | 1 -
.../engineering_diffraction/tabs/common/calibration_info.py | 3 ---
.../tabs/common/cropping/cropping_model.py | 2 --
.../tabs/common/cropping/cropping_presenter.py | 3 ---
.../tabs/common/cropping/cropping_view.py | 1 -
.../tabs/common/cropping/cropping_widget.py | 2 --
.../tabs/common/cropping/test/test_cropping_model.py | 2 --
.../tabs/common/cropping/test/test_cropping_presenter.py | 2 --
.../gui/engineering_diffraction/tabs/common/path_handling.py | 2 --
.../tabs/common/test/test_vanadium_corrections.py | 2 --
.../tabs/common/vanadium_corrections.py | 2 --
.../gui/engineering_diffraction/tabs/focus/model.py | 2 --
.../gui/engineering_diffraction/tabs/focus/presenter.py | 2 --
.../tabs/focus/test/test_focus_model.py | 2 --
.../tabs/focus/test/test_focus_presenter.py | 2 --
.../gui/engineering_diffraction/tabs/focus/view.py | 1 -
scripts/Engineering_Diffraction.py | 1 -
scripts/ErrorReporter/error_dialog_app.py | 2 --
scripts/ErrorReporter/error_report_presenter.py | 2 --
scripts/ErrorReporter/errorreport.py | 2 --
scripts/FilterEvents.py | 1 -
scripts/FilterEvents/eventFilterGUI.py | 1 -
scripts/Frequency_Domain_Analysis.py | 1 -
scripts/Frequency_Domain_Analysis_Old.py | 2 --
scripts/HFIR_4Circle_Reduction.py | 1 -
scripts/HFIR_4Circle_Reduction/FindUBUtility.py | 1 -
scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py | 1 -
scripts/HFIR_4Circle_Reduction/NTableWidget.py | 1 -
scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py | 1 -
scripts/HFIR_4Circle_Reduction/absorption.py | 1 -
scripts/HFIR_4Circle_Reduction/detector2dview.py | 1 -
scripts/HFIR_4Circle_Reduction/fourcircle_utility.py | 1 -
scripts/HFIR_4Circle_Reduction/fputility.py | 1 -
scripts/HFIR_4Circle_Reduction/guiutility.py | 1 -
scripts/HFIR_4Circle_Reduction/hfctables.py | 1 -
scripts/HFIR_4Circle_Reduction/integratedpeakview.py | 1 -
scripts/HFIR_4Circle_Reduction/message_dialog.py | 1 -
scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py | 1 -
scripts/HFIR_4Circle_Reduction/mplgraphicsview.py | 1 -
scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py | 1 -
scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py | 1 -
scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py | 1 -
scripts/HFIR_4Circle_Reduction/peak_integration_utility.py | 1 -
scripts/HFIR_4Circle_Reduction/peakprocesshelper.py | 1 -
scripts/HFIR_4Circle_Reduction/plot3dwindow.py | 1 -
scripts/HFIR_4Circle_Reduction/project_manager.py | 1 -
scripts/HFIR_4Circle_Reduction/reduce4circleControl.py | 1 -
scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py | 1 -
scripts/HFIR_4Circle_Reduction/refineubfftsetup.py | 2 --
scripts/HFIR_4Circle_Reduction/viewspicedialog.py | 1 -
scripts/Inelastic/CrystalField/__init__.py | 1 -
scripts/Inelastic/CrystalField/energies.py | 1 -
scripts/Inelastic/CrystalField/fitting.py | 1 -
scripts/Inelastic/CrystalField/function.py | 1 -
scripts/Inelastic/CrystalField/normalisation.py | 1 -
scripts/Inelastic/CrystalField/pointcharge.py | 1 -
scripts/Inelastic/Direct/AbsorptionShapes.py | 1 -
scripts/Inelastic/Direct/CommonFunctions.py | 2 --
scripts/Inelastic/Direct/DirectEnergyConversion.py | 1 -
scripts/Inelastic/Direct/ISISDirecInelasticConfig.py | 1 -
scripts/Inelastic/Direct/NonIDF_Properties.py | 1 -
scripts/Inelastic/Direct/PropertiesDescriptors.py | 1 -
scripts/Inelastic/Direct/PropertyManager.py | 1 -
scripts/Inelastic/Direct/ReductionHelpers.py | 1 -
scripts/Inelastic/Direct/ReductionWrapper.py | 1 -
scripts/Inelastic/Direct/RunDescriptor.py | 1 -
scripts/Inelastic/Direct/dgreduce.py | 1 -
scripts/Inelastic/Direct/diagnostics.py | 1 -
scripts/Inelastic/IndirectBayes.py | 1 -
scripts/Inelastic/IndirectCommon.py | 1 -
scripts/Inelastic/IndirectImport.py | 2 --
scripts/Inelastic/IndirectMuscat.py | 1 -
scripts/Inelastic/IndirectNeutron.py | 1 -
scripts/Inelastic/IndirectReductionCommon.py | 1 -
scripts/Inelastic/dos/load_castep.py | 1 -
scripts/Inelastic/dos/load_phonon.py | 1 -
scripts/Inelastic/vesuvio/backgrounds.py | 1 -
scripts/Inelastic/vesuvio/base.py | 1 -
scripts/Inelastic/vesuvio/commands.py | 2 --
scripts/Inelastic/vesuvio/profiles.py | 1 -
scripts/Interface/compile_pd_ui.py | 1 -
scripts/Interface/compile_util_ui.py | 1 -
scripts/Interface/reduction_application.py | 1 -
.../Interface/reduction_gui/instruments/dgs_interface_dev.py | 1 -
.../reduction_gui/instruments/diffraction_interface_dev.py | 1 -
.../reduction_gui/instruments/eqsans_interface_dev.py | 1 -
.../reduction_gui/instruments/hfir_interface_dev.py | 1 -
.../reduction_gui/instruments/instrument_factory.py | 1 -
scripts/Interface/reduction_gui/instruments/interface.py | 1 -
.../reduction_gui/instruments/toftof_interface_dev.py | 1 -
.../reduction/diffraction/diffraction_adv_setup_script.py | 1 -
.../reduction/diffraction/diffraction_filter_setup_script.py | 1 -
.../reduction/diffraction/diffraction_reduction_script.py | 1 -
.../reduction/diffraction/diffraction_run_setup_script.py | 1 -
.../Interface/reduction_gui/reduction/eqsans_reduction.py | 1 -
scripts/Interface/reduction_gui/reduction/hfir_reduction.py | 1 -
.../reduction/inelastic/dgs_absolute_units_script.py | 1 -
.../reduction/inelastic/dgs_data_corrections_script.py | 1 -
.../reduction/inelastic/dgs_diagnose_detectors_script.py | 1 -
.../reduction/inelastic/dgs_pd_sc_conversion_script.py | 1 -
.../reduction/inelastic/dgs_reduction_script.py | 1 -
.../reduction/inelastic/dgs_sample_data_setup_script.py | 1 -
.../Interface/reduction_gui/reduction/inelastic/dgs_utils.py | 1 -
scripts/Interface/reduction_gui/reduction/output_script.py | 1 -
.../reduction/reflectometer/refl_data_script.py | 1 -
.../reduction/reflectometer/refl_data_series.py | 1 -
scripts/Interface/reduction_gui/reduction/sans/data_cat.py | 1 -
.../reduction_gui/reduction/sans/eqsans_background_script.py | 1 -
.../Interface/reduction_gui/reduction/sans/eqsans_catalog.py | 1 -
.../reduction_gui/reduction/sans/eqsans_data_proxy.py | 1 -
.../reduction_gui/reduction/sans/eqsans_data_script.py | 1 -
.../reduction_gui/reduction/sans/eqsans_options_script.py | 1 -
.../reduction_gui/reduction/sans/eqsans_sample_script.py | 1 -
.../reduction_gui/reduction/sans/hfir_background_script.py | 1 -
.../Interface/reduction_gui/reduction/sans/hfir_catalog.py | 1 -
.../reduction_gui/reduction/sans/hfir_data_proxy.py | 1 -
.../reduction_gui/reduction/sans/hfir_detector_script.py | 1 -
.../reduction_gui/reduction/sans/hfir_options_script.py | 1 -
.../reduction_gui/reduction/sans/hfir_sample_script.py | 1 -
scripts/Interface/reduction_gui/reduction/scripter.py | 1 -
.../reduction_gui/reduction/toftof/toftof_reduction.py | 2 --
.../Interface/reduction_gui/settings/application_settings.py | 1 -
scripts/Interface/reduction_gui/widgets/base_widget.py | 1 -
scripts/Interface/reduction_gui/widgets/data_table_view.py | 1 -
.../widgets/diffraction/diffraction_adv_setup.py | 1 -
.../widgets/diffraction/diffraction_filter_setup.py | 1 -
.../widgets/diffraction/diffraction_run_setup.py | 1 -
.../reduction_gui/widgets/inelastic/dgs_absolute_units.py | 1 -
.../reduction_gui/widgets/inelastic/dgs_data_corrections.py | 1 -
.../widgets/inelastic/dgs_diagnose_detectors.py | 1 -
.../reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py | 1 -
.../reduction_gui/widgets/inelastic/dgs_sample_setup.py | 1 -
scripts/Interface/reduction_gui/widgets/output.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py | 1 -
.../reduction_gui/widgets/sans/eqsans_instrument.py | 1 -
.../Interface/reduction_gui/widgets/sans/hfir_background.py | 1 -
.../Interface/reduction_gui/widgets/sans/hfir_detector.py | 1 -
.../Interface/reduction_gui/widgets/sans/hfir_instrument.py | 1 -
.../Interface/reduction_gui/widgets/sans/hfir_sample_data.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/stitcher.py | 1 -
.../Interface/reduction_gui/widgets/toftof/toftof_setup.py | 1 -
scripts/Interface/reduction_gui/widgets/util.py | 1 -
scripts/Interface/ui/batchwidget/batch_widget_gui.py | 1 -
.../ui/dataprocessorinterface/data_processor_gui.py | 1 -
scripts/Interface/ui/poldi/poldi_gui.py | 1 -
scripts/Interface/ui/sans_isis/beam_centre.py | 2 --
scripts/Interface/ui/sans_isis/diagnostics_page.py | 2 --
scripts/Interface/ui/sans_isis/masking_table.py | 2 --
scripts/Interface/ui/sans_isis/run_selector_widget.py | 2 --
scripts/Interface/ui/sans_isis/sans_data_processor_gui.py | 2 --
scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py | 1 -
scripts/Interface/ui/sans_isis/summation_settings_widget.py | 2 --
scripts/LargeScaleStructures/EQSANS_geometry.py | 1 -
scripts/LargeScaleStructures/PolrefTest.py | 1 -
scripts/LargeScaleStructures/REF_L_geometry.py | 1 -
scripts/LargeScaleStructures/ReflectometerCors.py | 1 -
scripts/LargeScaleStructures/data_stitching.py | 1 -
scripts/LargeScaleStructures/geometry_writer.py | 1 -
scripts/MantidIPython/__init__.py | 1 -
scripts/MantidIPython/plot_functions.py | 1 -
scripts/MultiPlotting/edit_windows/remove_plot_window.py | 2 --
scripts/MultiPlotting/edit_windows/select_subplot.py | 2 --
scripts/MultiPlotting/gridspec_engine.py | 2 --
scripts/MultiPlotting/multi_plotting_widget.py | 2 --
scripts/MultiPlotting/navigation_toolbar.py | 1 -
scripts/MultiPlotting/subplot/subplot.py | 2 --
scripts/MultiPlotting/subplot/subplot_ADS_observer.py | 2 --
scripts/MultiPlotting/subplot/subplot_context.py | 1 -
scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py | 1 -
scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py | 1 -
scripts/Muon/GUI/Common/calculate_pair_and_group.py | 2 --
scripts/Muon/GUI/Common/checkbox.py | 2 --
.../Muon/GUI/Common/context_example/context_example_model.py | 2 --
.../GUI/Common/context_example/context_example_presenter.py | 3 ---
.../Muon/GUI/Common/context_example/context_example_view.py | 3 ---
.../GUI/Common/context_example/context_example_widget.py | 3 ---
scripts/Muon/GUI/Common/contexts/fitting_context.py | 2 --
scripts/Muon/GUI/Common/contexts/muon_context.py | 2 --
.../Muon/GUI/Common/contexts/muon_context_ADS_observer.py | 1 -
scripts/Muon/GUI/Common/contexts/muon_data_context.py | 2 --
scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py | 2 --
scripts/Muon/GUI/Common/contexts/muon_gui_context.py | 2 --
scripts/Muon/GUI/Common/contexts/phase_table_context.py | 2 --
scripts/Muon/GUI/Common/dock/dock_view.py | 2 --
scripts/Muon/GUI/Common/dock/dockable_tabs.py | 3 ---
scripts/Muon/GUI/Common/dummy/dummy_presenter.py | 3 ---
scripts/Muon/GUI/Common/dummy/dummy_view.py | 3 ---
scripts/Muon/GUI/Common/dummy/dummy_widget.py | 3 ---
scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py | 3 ---
scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py | 3 ---
scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py | 3 ---
scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py | 2 --
.../Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py | 2 --
.../GUI/Common/fitting_tab_widget/fitting_tab_presenter.py | 2 --
.../Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py | 2 --
.../Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py | 2 --
.../GUI/Common/fitting_tab_widget/workspace_selector_view.py | 2 --
scripts/Muon/GUI/Common/group_object.py | 1 -
.../GUI/Common/grouping_tab_widget/grouping_tab_widget.py | 2 --
.../Common/grouping_tab_widget/grouping_tab_widget_model.py | 2 --
.../grouping_tab_widget/grouping_tab_widget_presenter.py | 2 --
.../Common/grouping_tab_widget/grouping_tab_widget_view.py | 2 --
.../grouping_table_widget/grouping_table_widget_presenter.py | 2 --
.../grouping_table_widget/grouping_table_widget_view.py | 2 --
scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py | 1 -
scripts/Muon/GUI/Common/help_widget/help_widget_view.py | 1 -
.../home_instrument_widget/home_instrument_widget_model.py | 2 --
.../home_instrument_widget_presenter.py | 2 --
.../home_instrument_widget/home_instrument_widget_view.py | 2 --
.../Common/home_runinfo_widget/home_runinfo_widget_model.py | 2 --
.../home_runinfo_widget/home_runinfo_widget_presenter.py | 2 --
.../Common/home_runinfo_widget/home_runinfo_widget_view.py | 1 -
scripts/Muon/GUI/Common/home_tab/home_tab_model.py | 3 ---
scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py | 2 --
scripts/Muon/GUI/Common/home_tab/home_tab_view.py | 2 --
scripts/Muon/GUI/Common/home_tab/home_tab_widget.py | 2 --
scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py | 2 --
.../Muon/GUI/Common/list_selector/list_selector_presenter.py | 2 --
scripts/Muon/GUI/Common/list_selector/list_selector_view.py | 2 --
scripts/Muon/GUI/Common/load_file_widget/model.py | 2 --
scripts/Muon/GUI/Common/load_file_widget/presenter.py | 2 --
scripts/Muon/GUI/Common/load_file_widget/view.py | 2 --
scripts/Muon/GUI/Common/load_run_widget/load_run_model.py | 1 -
.../Muon/GUI/Common/load_run_widget/load_run_presenter.py | 2 --
scripts/Muon/GUI/Common/load_run_widget/load_run_view.py | 2 --
scripts/Muon/GUI/Common/message_box.py | 2 --
scripts/Muon/GUI/Common/muon_context/muon_context.py | 1 -
scripts/Muon/GUI/Common/muon_group.py | 2 --
scripts/Muon/GUI/Common/muon_load_data.py | 2 --
scripts/Muon/GUI/Common/muon_pair.py | 2 --
scripts/Muon/GUI/Common/pair_object.py | 3 ---
.../pairing_table_widget/pairing_table_widget_presenter.py | 2 --
.../Common/pairing_table_widget/pairing_table_widget_view.py | 2 --
.../GUI/Common/phase_table_widget/phase_table_presenter.py | 2 --
.../Muon/GUI/Common/phase_table_widget/phase_table_view.py | 2 --
.../Muon/GUI/Common/phase_table_widget/phase_table_widget.py | 2 --
.../Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py | 2 --
scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py | 2 --
.../Muon/GUI/Common/plotting_widget/plotting_widget_model.py | 1 -
.../GUI/Common/plotting_widget/plotting_widget_presenter.py | 1 -
.../Muon/GUI/Common/plotting_widget/plotting_widget_view.py | 2 --
scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py | 2 --
.../Muon/GUI/Common/results_tab_widget/results_tab_model.py | 2 --
.../GUI/Common/results_tab_widget/results_tab_presenter.py | 2 --
.../Muon/GUI/Common/results_tab_widget/results_tab_view.py | 2 --
.../Muon/GUI/Common/results_tab_widget/results_tab_widget.py | 2 --
scripts/Muon/GUI/Common/run_selection_dialog.py | 3 ---
.../seq_fitting_tab_widget/seq_fitting_tab_presenter.py | 1 -
.../Common/seq_fitting_tab_widget/seq_fitting_tab_view.py | 2 --
.../Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py | 2 --
scripts/Muon/GUI/Common/test_helpers/context_setup.py | 2 --
scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py | 2 --
scripts/Muon/GUI/Common/thread_model.py | 2 --
scripts/Muon/GUI/Common/thread_model_wrapper.py | 3 ---
scripts/Muon/GUI/Common/usage_report.py | 2 --
scripts/Muon/GUI/Common/utilities/algorithm_utils.py | 2 --
scripts/Muon/GUI/Common/utilities/load_utils.py | 2 --
scripts/Muon/GUI/Common/utilities/muon_file_utils.py | 2 --
scripts/Muon/GUI/Common/utilities/muon_test_helpers.py | 3 ---
scripts/Muon/GUI/Common/utilities/run_string_utils.py | 2 --
scripts/Muon/GUI/Common/utilities/table_utils.py | 2 --
scripts/Muon/GUI/Common/utilities/xml_utils.py | 2 --
scripts/Muon/GUI/Common/validate_errors.py | 3 ---
.../GUI/ElementalAnalysis/Detectors/detectors_presenter.py | 3 ---
.../Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py | 2 --
.../ElementalAnalysis/LineSelector/LineSelectorPresenter.py | 3 ---
.../GUI/ElementalAnalysis/LineSelector/LineSelectorView.py | 2 --
scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py | 1 -
scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py | 3 ---
scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py | 2 --
.../PeriodicTable/PeakSelector/peak_selector_presenter.py | 3 ---
.../PeriodicTable/PeakSelector/peak_selector_view.py | 1 -
scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py | 3 ---
.../GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py | 2 --
scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py | 2 --
scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py | 2 --
scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py | 2 --
.../GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py | 3 ---
.../FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py | 2 --
.../GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py | 2 --
.../GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py | 2 --
.../GUI/FrequencyDomainAnalysis/Transform/transform_view.py | 2 --
.../FrequencyDomainAnalysis/Transform/transform_widget.py | 2 --
.../TransformSelection/transform_selection_presenter.py | 3 ---
.../TransformSelection/transform_selection_view.py | 2 --
.../TransformSelection/transform_selection_widget.py | 2 --
.../Muon/GUI/FrequencyDomainAnalysis/frequency_context.py | 1 -
.../FrequencyDomainAnalysis/frequency_domain_analysis_2.py | 2 --
scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py | 2 --
scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py | 2 --
.../Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py | 2 --
.../GUI/MuonAnalysis/load_widget/load_widget_presenter.py | 2 --
.../Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py | 2 --
scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py | 2 --
scripts/Muon/MaxentTools/back.py | 1 -
scripts/Muon/MaxentTools/chinow.py | 1 -
scripts/Muon/MaxentTools/chosol.py | 2 --
scripts/Muon/MaxentTools/dead_detector_handler.py | 1 -
scripts/Muon/MaxentTools/deadfit.py | 1 -
scripts/Muon/MaxentTools/dist.py | 1 -
scripts/Muon/MaxentTools/input.py | 1 -
scripts/Muon/MaxentTools/maxent.py | 2 --
scripts/Muon/MaxentTools/modab.py | 1 -
scripts/Muon/MaxentTools/modamp.py | 1 -
scripts/Muon/MaxentTools/modbak.py | 1 -
scripts/Muon/MaxentTools/move.py | 1 -
scripts/Muon/MaxentTools/multimaxalpha.py | 1 -
scripts/Muon/MaxentTools/opus.py | 1 -
scripts/Muon/MaxentTools/outspec.py | 1 -
scripts/Muon/MaxentTools/project.py | 1 -
scripts/Muon/MaxentTools/start.py | 1 -
scripts/Muon/MaxentTools/tropus.py | 1 -
scripts/Muon/MaxentTools/zft.py | 1 -
scripts/Muon_Analysis.py | 1 -
scripts/ORNL_SANS.py | 1 -
scripts/Powder_Diffraction_Reduction.py | 1 -
scripts/PyChop/Chop.py | 1 -
scripts/PyChop/ISISDisk.py | 1 -
scripts/PyChop/ISISFermi.py | 1 -
scripts/PyChop/Instruments.py | 1 -
scripts/PyChop/MulpyRep.py | 1 -
scripts/PyChop/PyChop2.py | 1 -
scripts/PyChop/PyChopGui.py | 1 -
scripts/PyChop/__init__.py | 1 -
scripts/QECoverage.py | 1 -
scripts/Reflectometry/isis_reflectometry/combineMulti.py | 1 -
.../isis_reflectometry/convert_to_wavelength.py | 1 -
scripts/Reflectometry/isis_reflectometry/l2q.py | 1 -
scripts/Reflectometry/isis_reflectometry/load_live_runs.py | 1 -
scripts/Reflectometry/isis_reflectometry/procedures.py | 1 -
scripts/Reflectometry/isis_reflectometry/quick.py | 1 -
scripts/Reflectometry/isis_reflectometry/saveModule.py | 1 -
scripts/Reflectometry/isis_reflectometry/settings.py | 1 -
scripts/SANS/DarkRunCorrection.py | 1 -
scripts/SANS/ISISCommandInterface.py | 1 -
scripts/SANS/SANSBatchMode.py | 1 -
scripts/SANS/SANSUserFileParser.py | 1 -
scripts/SANS/SANSUtility.py | 1 -
scripts/SANS/SANSadd2.py | 2 --
scripts/SANS/centre_finder.py | 1 -
scripts/SANS/isis_instrument.py | 1 -
scripts/SANS/isis_reducer.py | 1 -
scripts/SANS/isis_reduction_steps.py | 1 -
scripts/SANS/reduction_settings.py | 1 -
.../sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py | 2 --
.../algorithm_detail/CreateSANSWavelengthPixelAdjustment.py | 2 --
scripts/SANS/sans/algorithm_detail/batch_execution.py | 2 --
scripts/SANS/sans/algorithm_detail/bundles.py | 1 -
.../sans/algorithm_detail/calculate_sans_transmission.py | 2 --
.../sans/algorithm_detail/calculate_transmission_helper.py | 1 -
scripts/SANS/sans/algorithm_detail/calibration.py | 1 -
scripts/SANS/sans/algorithm_detail/centre_finder_new.py | 2 --
scripts/SANS/sans/algorithm_detail/convert_to_q.py | 2 --
scripts/SANS/sans/algorithm_detail/crop_helper.py | 1 -
scripts/SANS/sans/algorithm_detail/load_data.py | 1 -
scripts/SANS/sans/algorithm_detail/mask_functions.py | 1 -
scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py | 2 --
scripts/SANS/sans/algorithm_detail/mask_workspace.py | 2 --
scripts/SANS/sans/algorithm_detail/merge_reductions.py | 2 --
scripts/SANS/sans/algorithm_detail/move_workspaces.py | 1 -
.../SANS/sans/algorithm_detail/normalize_to_sans_monitor.py | 2 --
scripts/SANS/sans/algorithm_detail/save_workspace.py | 1 -
scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py | 2 --
scripts/SANS/sans/algorithm_detail/single_execution.py | 2 --
scripts/SANS/sans/algorithm_detail/slice_sans_event.py | 2 --
.../SANS/sans/algorithm_detail/strip_end_nans_and_infs.py | 1 -
scripts/SANS/sans/algorithm_detail/xml_shapes.py | 1 -
scripts/SANS/sans/command_interface/ISISCommandInterface.py | 2 --
scripts/SANS/sans/command_interface/batch_csv_parser.py | 2 --
.../sans/command_interface/command_interface_functions.py | 1 -
.../command_interface/command_interface_state_director.py | 2 --
scripts/SANS/sans/common/configurations.py | 3 ---
scripts/SANS/sans/common/constants.py | 2 --
scripts/SANS/sans/common/enums.py | 2 --
scripts/SANS/sans/common/file_information.py | 1 -
scripts/SANS/sans/common/general_functions.py | 1 -
scripts/SANS/sans/common/log_tagger.py | 1 -
scripts/SANS/sans/common/xml_parsing.py | 2 --
scripts/SANS/sans/gui_logic/models/create_state.py | 1 -
scripts/SANS/sans/gui_logic/models/model_common.py | 2 --
.../SANS/sans/gui_logic/models/settings_adjustment_model.py | 2 --
scripts/SANS/sans/gui_logic/models/state_gui_model.py | 2 --
scripts/SANS/sans/gui_logic/models/table_model.py | 2 --
scripts/SANS/sans/gui_logic/plotting.py | 3 ---
.../SANS/sans/gui_logic/presenter/beam_centre_presenter.py | 2 --
.../SANS/sans/gui_logic/presenter/diagnostic_presenter.py | 2 --
scripts/SANS/sans/gui_logic/presenter/gui_state_director.py | 2 --
.../SANS/sans/gui_logic/presenter/masking_table_presenter.py | 2 --
scripts/SANS/sans/gui_logic/presenter/presenter_common.py | 2 --
scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py | 2 --
.../gui_logic/presenter/settings_adjustment_presenter.py | 2 --
.../gui_logic/presenter/settings_diagnostic_presenter.py | 3 ---
scripts/SANS/sans/sans_batch.py | 1 -
scripts/SANS/sans/state/AllStates.py | 2 --
scripts/SANS/sans/state/JsonSerializable.py | 2 --
scripts/SANS/sans/state/StateObjects/StateAdjustment.py | 2 --
.../sans/state/StateObjects/StateCalculateTransmission.py | 1 -
scripts/SANS/sans/state/StateObjects/StateCompatibility.py | 1 -
scripts/SANS/sans/state/StateObjects/StateConvertToQ.py | 1 -
scripts/SANS/sans/state/StateObjects/StateData.py | 1 -
scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py | 1 -
scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py | 2 --
.../SANS/sans/state/StateObjects/StateNormalizeToMonitor.py | 1 -
scripts/SANS/sans/state/StateObjects/StateReductionMode.py | 2 --
scripts/SANS/sans/state/StateObjects/StateSave.py | 1 -
scripts/SANS/sans/state/StateObjects/StateScale.py | 1 -
scripts/SANS/sans/state/StateObjects/StateSliceEvent.py | 1 -
scripts/SANS/sans/state/StateObjects/StateWavelength.py | 1 -
.../state/StateObjects/StateWavelengthAndPixelAdjustment.py | 1 -
scripts/SANS/sans/state/automatic_setters.py | 1 -
scripts/SANS/sans/state/state_functions.py | 2 --
scripts/SANS/sans/test_helper/mock_objects.py | 2 --
scripts/SANS/sans/test_helper/test_director.py | 1 -
scripts/SANS/sans/test_helper/user_file_test_helper.py | 2 --
scripts/SANS/sans/user_file/settings_tags.py | 2 --
scripts/SANS/sans/user_file/user_file_parser.py | 1 -
scripts/SANS/sans/user_file/user_file_reader.py | 2 --
scripts/SCD_Reduction/BVGFitTools.py | 1 -
scripts/SCD_Reduction/ICCFitTools.py | 1 -
scripts/SCD_Reduction/ReduceDictionary.py | 3 ---
scripts/SCD_Reduction/ReduceSCD_OneRun.py | 1 -
scripts/SCD_Reduction/ReduceSCD_Parallel.py | 1 -
scripts/SCD_Reduction/SCDCalibratePanelsResults.py | 1 -
scripts/SliceViewAnimator.py | 1 -
scripts/TemporaryREF_MScripts/testCenterREF_M.py | 1 -
scripts/TofConverter.py | 1 -
scripts/TofConverter/convertUnits.py | 1 -
scripts/TofConverter/converterGUI.py | 1 -
scripts/Vates/SXD_NaCl.py | 1 -
scripts/directtools/__init__.py | 2 --
scripts/directtools/_validate.py | 3 ---
scripts/pythonTSV.py | 2 --
scripts/reducer_singleton.py | 1 -
scripts/reduction/__init__.py | 1 -
scripts/reduction/command_interface.py | 1 -
scripts/reduction/find_data.py | 1 -
scripts/reduction/instrument.py | 1 -
scripts/reduction/instruments/example/ExampleRedStep.py | 1 -
scripts/reduction/instruments/example/example_reducer.py | 1 -
.../instruments/inelastic/direct_command_interface.py | 1 -
scripts/reduction/instruments/sans/sans_reducer.py | 1 -
scripts/reduction/instruments/sans/sans_reduction_steps.py | 1 -
scripts/reduction/reducer.py | 1 -
scripts/reduction_workflow/command_interface.py | 1 -
scripts/reduction_workflow/find_data.py | 2 --
.../instruments/sans/hfir_command_interface.py | 1 -
.../reduction_workflow/instruments/sans/hfir_instrument.py | 1 -
.../instruments/sans/sns_command_interface.py | 1 -
.../reduction_workflow/instruments/sans/sns_instrument.py | 2 --
scripts/reduction_workflow/reducer.py | 1 -
scripts/test/Abins/AbinsAtomsDataTest.py | 1 -
scripts/test/Abins/AbinsBroadeningTest.py | 1 -
scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py | 1 -
scripts/test/Abins/AbinsCalculatePowderTest.py | 1 -
scripts/test/Abins/AbinsCalculateQToscaTest.py | 1 -
scripts/test/Abins/AbinsCalculateSPowderTest.py | 1 -
scripts/test/Abins/AbinsCalculateSingleCrystalTest.py | 1 -
scripts/test/Abins/AbinsDWSingleCrystalDataTest.py | 1 -
scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py | 1 -
scripts/test/Abins/AbinsIOmoduleTest.py | 2 --
scripts/test/Abins/AbinsInstrumentTest.py | 1 -
scripts/test/Abins/AbinsKpointsDataTest.py | 1 -
scripts/test/Abins/AbinsLoadCASTEPTest.py | 1 -
scripts/test/Abins/AbinsLoadCRYSTALTest.py | 1 -
scripts/test/Abins/AbinsLoadDMOL3Test.py | 1 -
scripts/test/Abins/AbinsLoadGAUSSIANTest.py | 1 -
scripts/test/Abins/AbinsPowderDataTest.py | 1 -
scripts/test/Abins/AbinsSDataTest.py | 1 -
scripts/test/AbsorptionShapesTest.py | 1 -
scripts/test/CrystalFieldTest.py | 1 -
scripts/test/DirectEnergyConversionTest.py | 1 -
scripts/test/DirectPropertyManagerTest.py | 1 -
scripts/test/DirectPropertyManater_OldInterfaceXest.py | 1 -
scripts/test/DirectReductionHelpersTest.py | 1 -
scripts/test/ISISDirecInelasticConfigTest.py | 1 -
scripts/test/Muon/MaxEntPresenter_test.py | 2 --
scripts/test/Muon/PlottingView_test.py | 2 --
.../test/Muon/elemental_analysis/detectors_presenter_test.py | 2 --
scripts/test/Muon/elemental_analysis/lmodel_test.py | 2 --
scripts/test/Muon/fit_information_test.py | 2 --
scripts/test/Muon/fit_parameters_test.py | 2 --
scripts/test/Muon/fitting_context_test.py | 2 --
scripts/test/Muon/frequency_domain_context_test.py | 2 --
scripts/test/Muon/max_ent_presenter_load_interaction_test.py | 2 --
scripts/test/Muon/muon_gui_context_test.py | 2 --
.../test/Muon/results_tab_widget/results_tab_model_test.py | 2 --
scripts/test/Muon/utilities/muon_load_data_test.py | 2 --
.../Muon/utilities/muon_workspace_wrapper_directory_test.py | 2 --
scripts/test/Muon/utilities/muon_workspace_wrapper_test.py | 2 --
scripts/test/ReductionWrapperTest.py | 1 -
scripts/test/ReflectometryQuickAuxiliaryTest.py | 1 -
scripts/test/RunDescriptorTest.py | 1 -
scripts/test/SANS/algorithm_detail/batch_execution_test.py | 2 --
.../algorithm_detail/calculate_sans_transmission_test.py | 2 --
.../algorithm_detail/calculate_transmission_helper_test.py | 2 --
scripts/test/SANS/algorithm_detail/centre_finder_new_test.py | 2 --
scripts/test/SANS/algorithm_detail/convert_to_q_test.py | 2 --
.../create_sans_adjustment_workspaces_test.py | 2 --
.../create_sans_wavelength_pixel_adjustment_test.py | 2 --
scripts/test/SANS/algorithm_detail/crop_helper_test.py | 2 --
scripts/test/SANS/algorithm_detail/merge_reductions_test.py | 2 --
.../algorithm_detail/move_sans_instrument_component_test.py | 2 --
scripts/test/SANS/algorithm_detail/move_workspaces_test.py | 2 --
.../SANS/algorithm_detail/normalize_to_sans_monitor_test.py | 2 --
scripts/test/SANS/algorithm_detail/sans_slice_event_test.py | 2 --
.../test/SANS/algorithm_detail/scale_sans_workspace_test.py | 2 --
scripts/test/SANS/algorithm_detail/strip_end_nans_test.py | 2 --
.../SANS/command_interface/batch_csv_file_parser_test.py | 2 --
.../command_interface_state_director_test.py | 2 --
scripts/test/SANS/common/file_information_test.py | 2 --
scripts/test/SANS/common/general_functions_test.py | 2 --
scripts/test/SANS/common/log_tagger_test.py | 2 --
scripts/test/SANS/common/xml_parsing_test.py | 2 --
scripts/test/SANS/gui_logic/batch_process_runner_test.py | 2 --
scripts/test/SANS/gui_logic/beam_centre_model_test.py | 2 --
scripts/test/SANS/gui_logic/beam_centre_presenter_test.py | 2 --
scripts/test/SANS/gui_logic/create_state_test.py | 2 --
scripts/test/SANS/gui_logic/diagnostics_page_model_test.py | 2 --
.../test/SANS/gui_logic/diagnostics_page_presenter_test.py | 2 --
scripts/test/SANS/gui_logic/gui_common_test.py | 2 --
scripts/test/SANS/gui_logic/gui_state_director_test.py | 2 --
scripts/test/SANS/gui_logic/masking_table_presenter_test.py | 2 --
scripts/test/SANS/gui_logic/run_tab_presenter_test.py | 2 --
scripts/test/SANS/gui_logic/save_other_presenter_test.py | 2 --
.../SANS/gui_logic/settings_diagnostic_presenter_test.py | 2 --
scripts/test/SANS/gui_logic/state_gui_model_test.py | 2 --
scripts/test/SANS/gui_logic/table_model_test.py | 2 --
scripts/test/SANS/state/JsonSerializerTest.py | 2 --
scripts/test/SANS/state/adjustment_test.py | 2 --
scripts/test/SANS/state/calculate_transmission_test.py | 2 --
scripts/test/SANS/state/convert_to_q_test.py | 2 --
scripts/test/SANS/state/data_test.py | 2 --
scripts/test/SANS/state/mask_test.py | 2 --
scripts/test/SANS/state/move_test.py | 2 --
scripts/test/SANS/state/normalize_to_monitor_test.py | 2 --
scripts/test/SANS/state/reduction_mode_test.py | 2 --
scripts/test/SANS/state/save_test.py | 2 --
scripts/test/SANS/state/scale_test.py | 2 --
scripts/test/SANS/state/slice_event_test.py | 2 --
scripts/test/SANS/state/state_functions_test.py | 2 --
scripts/test/SANS/state/state_test.py | 2 --
.../test/SANS/state/wavelength_and_pixel_adjustment_test.py | 2 --
scripts/test/SANS/state/wavelength_test.py | 2 --
scripts/test/SANS/user_file/user_file_parser_test.py | 2 --
scripts/test/SANS/user_file/user_file_reader_test.py | 2 --
scripts/test/SANSBatchModeTest.py | 1 -
scripts/test/SANSCentreFinderTest.py | 1 -
scripts/test/SANSCommandInterfaceTest.py | 1 -
scripts/test/SANSIsisInstrumentTest.py | 1 -
scripts/test/SANSReducerTest.py | 1 -
scripts/test/SANSReductionStepsUserFileTest.py | 1 -
scripts/test/SANSUtilityTest.py | 1 -
scripts/test/SansIsisGuiSettings.py | 1 -
scripts/test/SettingsTest.py | 1 -
scripts/test/TOFTOF/TOFTOFGUITest.py | 2 --
scripts/test/TOFTOF/TOFTOFScriptElementTest.py | 2 --
scripts/test/directtools/DirectToolsTest.py | 2 --
tools/DOI/doi.py | 1 -
tools/DefaultConfigFiles/configToCpp.py | 1 -
tools/Documentation/wiki2rst.py | 1 -
tools/PeriodicTable/generate_atom_code.py | 1 -
tools/Pylint/fixPylint.py | 2 --
tools/Pylint/run_pylint.py | 1 -
tools/VTKConverter/processISISData.py | 1 -
tools/release_generator/patch.py | 1 -
tools/release_generator/release.py | 1 -
tools/reports/facility-code-changes.py | 2 --
tools/reports/release-list.py | 2 --
tools/scripts/ConvertBadAlgmLinks.py | 1 -
tools/scripts/CorrectConceptLinksinAlgPages.py | 1 -
tools/scripts/FindIncompleteAlgRSTPages.py | 1 -
tools/scripts/TestWikiPython.py | 1 -
tools/scripts/extractAlgorithmNames.py | 1 -
tools/scripts/extractAuthorNamesFromGit.py | 1 -
tools/scripts/pyqt4_to_qtpy.py | 1 -
tools/scripts/update-pr-base-branch.py | 2 --
tools/sip/sipwrapper.py | 2 --
1703 files changed, 27 insertions(+), 2817 deletions(-)
diff --git a/Framework/Doxygen/make_header.py b/Framework/Doxygen/make_header.py
index 44edaf67920..232c5ce99af 100644
--- a/Framework/Doxygen/make_header.py
+++ b/Framework/Doxygen/make_header.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six.moves import range #pylint: disable=redefined-builtin
import sys
diff --git a/Framework/PythonInterface/mantid/__init__.py b/Framework/PythonInterface/mantid/__init__.py
index abc301bbd94..42caea480da 100644
--- a/Framework/PythonInterface/mantid/__init__.py
+++ b/Framework/PythonInterface/mantid/__init__.py
@@ -22,8 +22,7 @@ algorithms and data objects that are:
Implementing Algorithms, Virtual Instrument Geometry.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import os
import sys
diff --git a/Framework/PythonInterface/mantid/_plugins/__init__.py b/Framework/PythonInterface/mantid/_plugins/__init__.py
index 136498795eb..1d7a9d6f688 100644
--- a/Framework/PythonInterface/mantid/_plugins/__init__.py
+++ b/Framework/PythonInterface/mantid/_plugins/__init__.py
@@ -19,8 +19,7 @@ and so methods, such as __len__() & add() inherited from CompositeFunction are m
The names from the library are not imported by default as it is best if the interface classes
are used for checks such as isinstance()
"""
-from __future__ import (absolute_import, division,
- print_function)
+
###############################################################################
# Load the C++ library and register the C++ class exports
diff --git a/Framework/PythonInterface/mantid/api/_workspaceops.py b/Framework/PythonInterface/mantid/api/_workspaceops.py
index f128e77c9b7..884acef7a41 100644
--- a/Framework/PythonInterface/mantid/api/_workspaceops.py
+++ b/Framework/PythonInterface/mantid/api/_workspaceops.py
@@ -10,8 +10,7 @@
It is intended for internal use.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import inspect as _inspect
import sys
diff --git a/Framework/PythonInterface/mantid/geometry/_aliases.py b/Framework/PythonInterface/mantid/geometry/_aliases.py
index 651fc5acd82..7c0bb2d932e 100644
--- a/Framework/PythonInterface/mantid/geometry/_aliases.py
+++ b/Framework/PythonInterface/mantid/geometry/_aliases.py
@@ -8,8 +8,7 @@
Defines a set of aliases to make accessing certain objects easier,
like in mantid.api.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from mantid.kernel._aliases import lazy_instance_access
from mantid.geometry import (SpaceGroupFactoryImpl, SymmetryOperationFactoryImpl,
diff --git a/Framework/PythonInterface/mantid/kernel/_aliases.py b/Framework/PythonInterface/mantid/kernel/_aliases.py
index d4a217c0c0b..a12a32b7c33 100644
--- a/Framework/PythonInterface/mantid/kernel/_aliases.py
+++ b/Framework/PythonInterface/mantid/kernel/_aliases.py
@@ -8,8 +8,7 @@
Defines a set of aliases for the kernel module to make
accessing certain objects easier.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from mantid.kernel import (ConfigServiceImpl, Logger, PropertyManagerDataServiceImpl, UnitFactoryImpl, UsageServiceImpl)
diff --git a/Framework/PythonInterface/mantid/kernel/funcinspect.py b/Framework/PythonInterface/mantid/kernel/funcinspect.py
index ce5a1611cf8..6833bf4531d 100644
--- a/Framework/PythonInterface/mantid/kernel/funcinspect.py
+++ b/Framework/PythonInterface/mantid/kernel/funcinspect.py
@@ -12,8 +12,7 @@
arguments that are being assigned to a function
return
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import opcode
import inspect
import sys
diff --git a/Framework/PythonInterface/mantid/kernel/plugins.py b/Framework/PythonInterface/mantid/kernel/plugins.py
index fe28799d80d..6e649c6b8ee 100644
--- a/Framework/PythonInterface/mantid/kernel/plugins.py
+++ b/Framework/PythonInterface/mantid/kernel/plugins.py
@@ -10,8 +10,7 @@ Defines functions to dynamically load Python modules.
These modules may define extensions to C++ types, e.g.
algorithms, fit functions etc.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
import os as _os
import sys as _sys
diff --git a/Framework/PythonInterface/mantid/plots/__init__.py b/Framework/PythonInterface/mantid/plots/__init__.py
index 587580b7201..496ddae931d 100644
--- a/Framework/PythonInterface/mantid/plots/__init__.py
+++ b/Framework/PythonInterface/mantid/plots/__init__.py
@@ -13,9 +13,6 @@ Functionality for unpacking mantid objects for plotting with matplotlib.
# This file should be left free of PyQt imports to allow quick importing
# of the main package.
-from __future__ import (absolute_import, division, print_function)
-
-
try:
from collections.abc import Iterable
except ImportError:
diff --git a/Framework/PythonInterface/mantid/plots/_compatability.py b/Framework/PythonInterface/mantid/plots/_compatability.py
index fb1b13958c3..9dfd4708bbc 100644
--- a/Framework/PythonInterface/mantid/plots/_compatability.py
+++ b/Framework/PythonInterface/mantid/plots/_compatability.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
# local imports
from mantid.kernel import Logger
from mantid.plots.utility import MantidAxType
diff --git a/Framework/PythonInterface/mantid/plots/axesfunctions.py b/Framework/PythonInterface/mantid/plots/axesfunctions.py
index 8fc4fdd6625..e70153a4e64 100644
--- a/Framework/PythonInterface/mantid/plots/axesfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/axesfunctions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import collections
import matplotlib
import matplotlib.collections as mcoll
diff --git a/Framework/PythonInterface/mantid/plots/axesfunctions3D.py b/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
index aff2d05efb0..708a48551d0 100644
--- a/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
+++ b/Framework/PythonInterface/mantid/plots/axesfunctions3D.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.plots.datafunctions import (get_axes_labels, get_normalization, get_distribution,
diff --git a/Framework/PythonInterface/mantid/plots/datafunctions.py b/Framework/PythonInterface/mantid/plots/datafunctions.py
index f86b46e53bd..6d6c2b7c098 100644
--- a/Framework/PythonInterface/mantid/plots/datafunctions.py
+++ b/Framework/PythonInterface/mantid/plots/datafunctions.py
@@ -7,8 +7,6 @@
# This file is part of the mantid package
#
#
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import numpy as np
diff --git a/Framework/PythonInterface/mantid/plots/legend.py b/Framework/PythonInterface/mantid/plots/legend.py
index af84c91242f..64417338aba 100644
--- a/Framework/PythonInterface/mantid/plots/legend.py
+++ b/Framework/PythonInterface/mantid/plots/legend.py
@@ -10,8 +10,6 @@
"""
Functionality for dealing with legends on plots
"""
-from __future__ import (absolute_import, division, print_function)
-
import sys
import matplotlib
diff --git a/Framework/PythonInterface/mantid/plots/scales.py b/Framework/PythonInterface/mantid/plots/scales.py
index d048f2ccbab..1d29e53e8c3 100644
--- a/Framework/PythonInterface/mantid/plots/scales.py
+++ b/Framework/PythonInterface/mantid/plots/scales.py
@@ -8,8 +8,6 @@
"""
Defines a set of custom axis scales
"""
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.plots.utility import mpl_version_info
from matplotlib.scale import ScaleBase
from matplotlib.ticker import (AutoLocator, NullFormatter,
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index d27238a25ec..cf88d6fba0f 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -20,8 +20,6 @@ This module should be fully compatible with:
* Python 3
"""
-from __future__ import (absolute_import, print_function, unicode_literals)
-
import inspect
import six
from six import * # noqa
diff --git a/Framework/PythonInterface/mantid/simpleapi.py b/Framework/PythonInterface/mantid/simpleapi.py
index 1f33127f28f..2f4c2c59376 100644
--- a/Framework/PythonInterface/mantid/simpleapi.py
+++ b/Framework/PythonInterface/mantid/simpleapi.py
@@ -26,8 +26,6 @@ and assign it to the rebinned variable.
Importing this module starts the FrameworkManager instance.
"""
-from __future__ import (absolute_import, division, print_function)
-
# std libs
from collections import OrderedDict, namedtuple
import inspect
diff --git a/Framework/PythonInterface/plugins/algorithms/Abins.py b/Framework/PythonInterface/plugins/algorithms/Abins.py
index 1fe77c6498b..40a3e76fb9c 100644
--- a/Framework/PythonInterface/plugins/algorithms/Abins.py
+++ b/Framework/PythonInterface/plugins/algorithms/Abins.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
try:
import pathos.multiprocessing as mp
diff --git a/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py b/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
index 3adcc45b382..dcdaf177c8c 100644
--- a/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/AlignAndFocusPowderFromFiles.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd, AlgorithmFactory, DistributedDataProcessorAlgorithm, ITableWorkspaceProperty, \
MatrixWorkspaceProperty, MultipleFileProperty, PropertyMode
from mantid.kernel import Direction, PropertyManagerDataService
diff --git a/Framework/PythonInterface/plugins/algorithms/AlignComponents.py b/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
index 97cba2c7b03..372ff1cc1fe 100644
--- a/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
+++ b/Framework/PythonInterface/plugins/algorithms/AlignComponents.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, no-name-in-module
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
from scipy.stats import chisquare
diff --git a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
index b2f6708dbab..a1bf9da02f7 100644
--- a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
+++ b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsSingleAxis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
index 5b2f0bce725..98956e4ae0d 100644
--- a/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
+++ b/Framework/PythonInterface/plugins/algorithms/AngularAutoCorrelationsTwoAxes.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py b/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
index fc3ab839adf..ad9e7bb40ed 100644
--- a/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import * # PythonAlgorithm, registerAlgorithm, WorkspaceProperty
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
index 27c5b797860..f316a03fc28 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import tempfile
from collections import namedtuple
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
index 0bd137efa02..298df732af1 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISDiffraction.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import tempfile
import itertools
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
index be7b8180488..cb57a5ec9d9 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import random
import os
import string
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISReduction.py b/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
index f1ecf432c12..08310c4064c 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISReduction.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# Mantid Repository : https://github.com/mantidproject/mantid
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import os
import re
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py b/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
index 94530f3de2b..88bb7f78c28 100644
--- a/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
+++ b/Framework/PythonInterface/plugins/algorithms/BinWidthAtX.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory, HistogramValidator,\
MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py b/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
index 4e44fe523e8..edf12705b6b 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateFlux.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator, HistogramValidator, InstrumentValidator
from mantid.simpleapi import *
from mantid.kernel import Direction, FloatBoundedValidator, CompositeValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py b/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
index 2c54044b289..96e4e790897 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalculateSampleTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py b/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
index 549a16febb1..f3f7d2eb877 100644
--- a/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/CalibrateRectangularDetectors.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py b/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
index 7443fc437d4..225b486e0a2 100644
--- a/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
+++ b/Framework/PythonInterface/plugins/algorithms/CheckForSampleLogs.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty
from mantid.kernel import Direction, logger
diff --git a/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py b/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
index 826c8752c40..4323ad913f7 100644
--- a/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
+++ b/Framework/PythonInterface/plugins/algorithms/CleanFileCache.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,bare-except,too-many-arguments,multiple-statements
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
index f615a6faf2f..dc8648cbf70 100644
--- a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
import mantid
import mantid.simpleapi as api
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py b/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
index a6c090705b7..268774d7542 100644
--- a/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
+++ b/Framework/PythonInterface/plugins/algorithms/CompareSampleLogs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceGroup, MatrixWorkspace
from mantid.kernel import Direction, StringArrayLengthValidator, StringArrayProperty, FloatBoundedValidator
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
index 3687c3c78d4..a8edf867245 100644
--- a/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
+++ b/Framework/PythonInterface/plugins/algorithms/ComputeCalibrationCoefVan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty, Progress, InstrumentValidator,
ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py b/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
index 85414aade70..cf57058ce93 100644
--- a/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
+++ b/Framework/PythonInterface/plugins/algorithms/ComputeIncoherentDOS.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable = no-init, invalid-name, line-too-long, eval-used, unused-argument, too-many-locals, too-many-branches, too-many-statements
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from scipy import constants
from mantid.kernel import CompositeValidator, Direction, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py b/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
index 72e44169cb9..43c0909085c 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py b/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
index d81bc78a591..61c9d9b593f 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConjoinSpectra.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py b/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
index 09721f7e6e3..c652b75f710 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConvertSnsRoiFileToMask.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as msapi
import mantid.api as api
import mantid.kernel as kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py b/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
index f334589ed49..e8a8470f151 100644
--- a/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/ConvertWANDSCDtoQ.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
PropertyMode, WorkspaceProperty, Progress,
IMDHistoWorkspaceProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py b/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
index 2c43988cb61..62f5ad71dbe 100644
--- a/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
+++ b/Framework/PythonInterface/plugins/algorithms/CorrectLogTimes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi
import mantid.api
import mantid.kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py b/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
index d100f99a0ab..9fc55f8db6b 100644
--- a/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
+++ b/Framework/PythonInterface/plugins/algorithms/CorrectTOF.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import scipy as sp
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py b/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
index 631a90978e0..1fc0e5b6095 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateCacheFilename.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,bare-except,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
index 4c7ed28904b..08898762eaf 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateEmptyTableWorkspace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty, WorkspaceFactory
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
index 178268813bc..a5b60f8579f 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
index e3e7986d3a8..1b169df38e5 100644
--- a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
+++ b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceForMDNorm.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
WorkspaceUnitValidator,IEventWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
index 616ffd680b5..369d6ae36f2 100644
--- a/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
+++ b/Framework/PythonInterface/plugins/algorithms/CropWorkspaceRagged.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import ConjoinWorkspaces, CropWorkspace, DeleteWorkspace
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py b/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
index f920a78d7a5..5062076fa29 100644
--- a/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
+++ b/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-locals,too-many-instance-attributes,too-many-arguments,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py b/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
index 337de47751a..73987760d88 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSComputeDetEffCorrCoefs.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, WorkspaceGroup
from mantid.kernel import Direction, StringArrayProperty, StringArrayLengthValidator, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py b/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
index f1c3ec437cf..47b568b4a14 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSFlippingRatioCorr.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-locals
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
index 1f8ac0b97b4..e100d28e318 100644
--- a/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/DNSMergeRuns.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroup
from mantid.kernel import Direction, StringArrayProperty, StringListValidator, V3D, StringArrayLengthValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py b/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
index ece8f7bcf7d..e10be7abf19 100644
--- a/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/DPDFreduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import numpy
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/DSFinterp.py b/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
index 944a78ff8d9..d7304b24840 100644
--- a/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
+++ b/Framework/PythonInterface/plugins/algorithms/DSFinterp.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
import mantid.simpleapi
from mantid.kernel import StringListValidator, FloatArrayProperty, FloatArrayMandatoryValidator,\
diff --git a/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py b/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
index eaafa1e617b..49470911acb 100644
--- a/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
+++ b/Framework/PythonInterface/plugins/algorithms/DakotaChiSquared.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory,MatrixWorkspaceProperty,PropertyMode
from mantid.kernel import Direction
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py b/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
index 1de36ac7360..4b9d67186a1 100644
--- a/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
+++ b/Framework/PythonInterface/plugins/algorithms/DeltaPDF3D.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, IMDHistoWorkspaceProperty, PropertyMode, WorkspaceProperty, Progress
from mantid.kernel import (Direction, EnabledWhenProperty, PropertyCriterion, Property, StringListValidator, FloatArrayBoundedValidator,
FloatArrayProperty, FloatBoundedValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
index c9c919f6f4d..38d494540ba 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggCalibrate.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py b/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
index 71d4e3d48fd..05da9f6e4b2 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggCalibrateFull.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py b/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
index badf5e32e36..278c4d41167 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFitPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py b/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
index f97556daa11..b7f106ab0b6 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFitTOFFromPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggFocus.py b/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
index 56ad9aadbf8..71e025b5adb 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggFocus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
index 3e64ee1c7a6..39896a8c3d3 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
index 502770be183..3a298b72cf3 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py b/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
index 34bc610f6b1..caaed8cdb56 100644
--- a/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
+++ b/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
index 9e997b7a6e5..0bcae966cdd 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py b/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
index 7ea23478e57..90aba83bfba 100644
--- a/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
+++ b/Framework/PythonInterface/plugins/algorithms/Examples/ExampleSaveAscii.py
@@ -12,7 +12,6 @@ Note that the SaveAscii algorithm should be used instead in most cases.
"""
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py b/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
index 2ad3c4b0908..557e891f5a0 100644
--- a/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
+++ b/Framework/PythonInterface/plugins/algorithms/Examples/Squares.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
index 1ce6a2fb474..220a94c6bc8 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py b/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
index bd90b173e7d..fe9069f4f48 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportGeometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, \
InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, StringArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
index 050bce2d6fc..429c6abfc28 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
from distutils.version import LooseVersion
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
index 990ef236125..6da83c409ad 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToHDF5.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py b/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
index f3e5387b001..36527b0cb60 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSpectraMask.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
import os
from mantid import config
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, mtd, FileProperty, FileAction
diff --git a/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py b/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
index c9b3e9a53d2..27e69fa123f 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExtractMonitors.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import (MatrixWorkspaceProperty, DataProcessorAlgorithm, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py b/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
index ea0ec4d17c8..f80748fe62b 100644
--- a/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
+++ b/Framework/PythonInterface/plugins/algorithms/FilterLogByTime.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/FitGaussian.py b/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
index ef6ce8ccbc8..e8d7999c23e 100644
--- a/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
+++ b/Framework/PythonInterface/plugins/algorithms/FitGaussian.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty
from mantid.kernel import Direction, IntBoundedValidator
from mantid.simpleapi import Fit
diff --git a/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py b/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
index 001b551274c..13d3da9a786 100644
--- a/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/GSASIIRefineFitPeaks.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from contextlib import contextmanager
import numpy
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py b/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
index 8748d4b7c12..956e0ee716b 100644
--- a/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
+++ b/Framework/PythonInterface/plugins/algorithms/GenerateGroupingSNSInelastic.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
import mantid.api
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py b/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
index 48246f1a5e7..e2e42699f66 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetEiT0atSNS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid
import numpy
diff --git a/Framework/PythonInterface/plugins/algorithms/GetIPTS.py b/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
index 89d49af1c7c..98e3a99c390 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetIPTS.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory, FileFinder, PythonAlgorithm
from mantid.kernel import ConfigService, Direction, IntBoundedValidator, \
StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py b/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
index 08e1a35e0b8..c1642a44637 100644
--- a/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
+++ b/Framework/PythonInterface/plugins/algorithms/GetLiveInstrumentValue.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py b/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
index 7c874bc906a..4c728b1336e 100644
--- a/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
+++ b/Framework/PythonInterface/plugins/algorithms/HB2AReduce.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceProperty, FileProperty,
FileAction, MultipleFileProperty)
from mantid.kernel import (Direction, IntArrayProperty, FloatTimeSeriesProperty, FloatBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py b/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
index f766d6af1f6..d218b44d254 100644
--- a/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
+++ b/Framework/PythonInterface/plugins/algorithms/HFIRSANS2Wavelength.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress)
from mantid.kernel import (Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py b/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
index 3fa272cade2..09c79a2ab9a 100644
--- a/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/IndirectTransmission.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
index 9ca63312683..318c8e11c85 100644
--- a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
+++ b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py
@@ -11,7 +11,6 @@ fitting for integrating peaks.
"""
# This __future__ import is for Python 2/3 compatibility
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
index 9be2f10bf57..a34187efb4c 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
@@ -8,7 +8,6 @@
"""
Top-level auto-reduction algorithm for the SNS Liquids Reflectometer
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import math
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py b/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
index d7cccf9be61..961f7aeae38 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRDirectBeamSort.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py b/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
index 22054d2a6b6..b2c2c9ed51d 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRPeakSelection.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py b/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
index 31a072787b8..5f665bbbf2d 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRPrimaryFraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py b/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
index f49c58c0069..bf2c5f81f41 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRReflectivityOutput.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import math
import time
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
index d474992872d..19a80942506 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
import os
import re
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py b/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
index 59330c218ed..529e190a582 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRSubtractAverageBackground.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py b/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
index a2126f254b2..157d0bff4b9 100644
--- a/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py
@@ -13,7 +13,6 @@
- Keep the same parameters and work as a drop-in replacement for the old algorithm.
- Reproduce the output of the old algorithm.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import math
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py b/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
index dcaca149e62..f253e59449f 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadAndMerge.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os.path
from mantid.kernel import Direction, StringContainsValidator, PropertyManagerProperty
from mantid.api import AlgorithmFactory, AlgorithmManager, MultipleFileProperty, \
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
index ce451509a5d..5e87e1efbf5 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py b/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
index 1989684cc60..1e1f30e5d65 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadDNSLegacy.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
import numpy as np
from scipy.constants import m_n, h, physical_constants
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadEXED.py b/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
index 235c2685136..90c491335ba 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadEXED.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction
from mantid.api import (PythonAlgorithm, AlgorithmFactory, FileAction,
FileProperty, WorkspaceProperty, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
index 7b7e6b8d3b0..44f219a3c18 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadEmptyVesuvio.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
index 7d51a5d09a1..60be827d095 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty, WorkspaceFactory,\
FileProperty, FileAction, MatrixWorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
index ee167e499d1..57d93a71b2d 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadGudrunOutput.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (FileProperty, WorkspaceProperty, PythonAlgorithm,
AlgorithmFactory, FileAction, PropertyMode)
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadLamp.py b/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
index 78b8b68b7cf..522d828aade 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadLamp.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import FileProperty, WorkspaceProperty, PythonAlgorithm, AlgorithmFactory, FileAction
from mantid.kernel import Direction
from mantid.simpleapi import CreateWorkspace, AddSampleLogMultiple
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py b/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
index abc6ed0c968..691488d90cc 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadLogPropertyTable.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import time
import datetime
import numbers
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py b/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
index 3cb95b539e9..8cf3a15dce7 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadMultipleGSS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
index a8138648d02..3bc944955a5 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn3Ascii.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
index 857343d6a15..0f583a62830 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
index 2afefea75a3..a47b39fe746 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadNMoldyn4Ascii1D.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import CreateWorkspace, GroupWorkspaces
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py b/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
index 7d0aaf953c4..5b25055a3cb 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadPreNexusLive.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid import mtd
from mantid.api import AlgorithmFactory, DataProcessorAlgorithm, FileAction, \
FileProperty, WorkspaceProperty
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py b/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
index d630240588f..9372808fe58 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadSINQ.py
@@ -13,7 +13,6 @@
#
# Mark Koennecke, November 2012
#--------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction, StringListValidator, ConfigServiceImpl
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py b/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
index 9717663c928..28686db4023 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadSINQFile.py
@@ -12,7 +12,6 @@
#
# Mark Koennecke, November 2012
#--------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm, FileProperty, FileAction, WorkspaceProperty
from mantid.kernel import Direction, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
index cc1b385463f..46218e7a196 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi as ms
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
index 4a93e325df9..a0e12eb4793 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticBS.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
index b12a8e508c4..064ffda752e 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionElasticEQ.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py b/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
index 1eeceabf0d4..0b0d89f4642 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVisionInelastic.py
@@ -8,7 +8,6 @@
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py b/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
index 8303c6ee52b..56975dc6e17 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadWANDSCD.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceProperty, Progress, MultipleFileProperty, FileAction, mtd
from mantid.kernel import Direction, Property, IntArrayProperty, StringListValidator
from mantid.simpleapi import LoadEventNexus, RemoveLogs, DeleteWorkspace, ConvertToMD, Rebin, CreateGroupingWorkspace, GroupDetectors, SetUB
diff --git a/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py b/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
index 5afbd8df43f..4007d78e242 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRFilterCrossSections.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
from operator import itemgetter
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py b/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
index 5c22cb0a32d..76cee08884b 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRGetTheta.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty
from mantid.kernel import Direction, FloatBoundedValidator, Property
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/MRInspectData.py b/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
index df20dc64118..a79f7e03be5 100644
--- a/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
+++ b/Framework/PythonInterface/plugins/algorithms/MRInspectData.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=bare-except,no-init,invalid-name,dangerous-default-value
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py b/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
index 54bed65f323..ca521300ca4 100644
--- a/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/MagnetismReflectometryReduction.py
@@ -8,7 +8,6 @@
"""
Magnetism reflectometry reduction
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskAngle.py b/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
index c582e5432f4..8e444a5d12e 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskAngle.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi
import mantid.kernel
import mantid.api
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskBTP.py b/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
index d00a88e3827..7f85a18ff2c 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskBTP.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi
import mantid.api
from mantid.kernel import Direction, IntArrayProperty, StringArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py b/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
index 3132c489f53..df4eda9955f 100644
--- a/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/MaskWorkspaceToCalFile.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name, no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py b/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
index 10ce38de769..6dc3de89daf 100644
--- a/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/MatchPeaks.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, ITableWorkspaceProperty, PropertyMode, MatrixWorkspace
from mantid.simpleapi import *
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py b/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
index 93037bf04dd..40e0d1f648b 100644
--- a/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/MatchSpectra.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import AlgorithmFactory, MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction, FloatArrayProperty
from mantid.simpleapi import ConvertToMatrixWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/Mean.py b/Framework/PythonInterface/plugins/algorithms/Mean.py
index ce512228833..da10b76a2c9 100644
--- a/Framework/PythonInterface/plugins/algorithms/Mean.py
+++ b/Framework/PythonInterface/plugins/algorithms/Mean.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py b/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
index 004edb5c7ee..e3146e61897 100644
--- a/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
+++ b/Framework/PythonInterface/plugins/algorithms/MedianBinWidth.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory, HistogramValidator,\
MatrixWorkspaceProperty, PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py b/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
index 93823859779..173e428bee1 100644
--- a/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
+++ b/Framework/PythonInterface/plugins/algorithms/MergeCalFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py b/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
index 4492297d979..2cdd2a9e453 100644
--- a/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
+++ b/Framework/PythonInterface/plugins/algorithms/MuonMaxent.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
from Muon.MaxentTools.multimaxalpha import MULTIMAX
diff --git a/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py b/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
index 5c9b53886db..a894d539e00 100644
--- a/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
+++ b/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty)
from mantid.kernel import (Direction, logger)
diff --git a/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py b/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
index 12a441399fb..ff673ad2bf4 100644
--- a/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
+++ b/Framework/PythonInterface/plugins/algorithms/NormaliseSpectra.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import (MatrixWorkspaceProperty, DataProcessorAlgorithm, AlgorithmFactory)
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py b/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
index af20bcc293b..e60e2c89ca7 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDConvertRealSpace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
MatrixWorkspaceProperty,
WorkspaceProperty, WorkspaceFactory)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py b/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
index e6c796f1b81..a2209b56059 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDConvertReciprocalSpace.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory,
WorkspaceUnitValidator, MatrixWorkspaceProperty,
WorkspaceProperty, WorkspaceFactory)
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py b/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
index 5c016a408c7..da17a93e6d3 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToGUDRUN.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import Direction, FloatArrayProperty, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
index 1b529a9d6ea..49a1356e4c8 100644
--- a/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
+++ b/Framework/PythonInterface/plugins/algorithms/PDToPDFgetN.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import AlignAndFocusPowder, AlignAndFocusPowderFromFiles, \
NormaliseByCurrent, PDDetermineCharacterizations,PDLoadCharacterizations, \
SaveGSS, SetUncertainties
diff --git a/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py b/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
index 83553032a2a..77b62ce576a 100644
--- a/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/PearlMCAbsorption.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py b/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
index 62dfdc88e03..f776116e342 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# pylint: disable=no-init,invalid-name,too-few-public-methods,unused-import
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py b/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
index aba6c8a29aa..071a07d1f38 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiLoadRuns.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# pylint: disable=no-init,invalid-name,bare-except
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py b/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
index cbb2b0d32a5..c75aaee36d4 100644
--- a/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
+++ b/Framework/PythonInterface/plugins/algorithms/PoldiMerge.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import StringArrayProperty, Direction
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
index ee5baf1560d..02f4013389e 100644
--- a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
+++ b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from six.moves import range #pylint: disable=redefined-builtin
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py b/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
index 485b7c2c9e5..b3aee6bf987 100644
--- a/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
+++ b/Framework/PythonInterface/plugins/algorithms/ReflectometryReductionOneLiveData.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py b/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
index 65cf8ce0b25..785929f3bf1 100644
--- a/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/ReflectometrySliceEventWorkspace.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/ResNorm.py b/Framework/PythonInterface/plugins/algorithms/ResNorm.py
index 3e0a41f0ed2..69d653e87e7 100644
--- a/Framework/PythonInterface/plugins/algorithms/ResNorm.py
+++ b/Framework/PythonInterface/plugins/algorithms/ResNorm.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import StringListValidator, StringMandatoryValidator
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
index b964d99cb5a..25dc24e9f98 100644
--- a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty
from mantid.simpleapi import *
from mantid.kernel import StringMandatoryValidator, Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py b/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
index 360128e7fc2..0507c9f139c 100644
--- a/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
+++ b/Framework/PythonInterface/plugins/algorithms/SANSSubtract.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import Direction, FloatBoundedValidator
import mantid.simpleapi
diff --git a/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py b/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
index 7d32302fc05..1f3484d86e4 100644
--- a/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/SANSWideAngleCorrection.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import sys
diff --git a/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py b/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
index 9209a655c97..c1091dae18e 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNAPReduce.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init,too-many-lines
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction, FloatArrayProperty, IntArrayBoundedValidator, \
IntArrayProperty, Property, StringListValidator
from mantid.api import AlgorithmFactory, DataProcessorAlgorithm, FileAction, FileProperty, \
diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
index 3e16ac1decc..0801a0af7be 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-lines
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py b/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
index 98786ee7d66..62340186d56 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveGEMMAUDParamFile.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import os
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
index 9cf53e444d7..05ea1460963 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 4fcdcd54360..23d30df368c 100644
--- a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,unused-variable,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
index cce52b5e21a..07c9abdbc2e 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import os.path as osp
import numpy as np
from mantid.api import (AlgorithmFactory, FileProperty, FileAction, IPeaksWorkspaceProperty, PythonAlgorithm)
diff --git a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
index cb51bf58f83..168ca591adc 100644
--- a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
+++ b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=eval-used
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/SetDetScale.py b/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
index 7ab33c62646..8bd94324569 100644
--- a/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/SetDetScale.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, InstrumentValidator, FileProperty, FileAction
from mantid.kernel import Direction, StringArrayProperty
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
index 8a1b33421b6..3db628c5aa0 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import mantid.simpleapi as ms
diff --git a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
index f28c2dd820f..478365bb823 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import Direction,IntArrayProperty, FloatArrayProperty
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
index e5b63c88793..91e43e369df 100644
--- a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import collections
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/StringToPng.py b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
index 9e78bbc9df0..2a726daaad2 100644
--- a/Framework/PythonInterface/plugins/algorithms/StringToPng.py
+++ b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from six import u
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py b/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
index cb70790b3d4..f5d36047818 100644
--- a/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
+++ b/Framework/PythonInterface/plugins/algorithms/SuggestTibCNCS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import FloatBoundedValidator,Direction
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py b/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
index 85332455c48..dafd7fee8df 100644
--- a/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
+++ b/Framework/PythonInterface/plugins/algorithms/SuggestTibHYSPEC.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import FloatBoundedValidator,Direction,logger
import numpy
diff --git a/Framework/PythonInterface/plugins/algorithms/Symmetrise.py b/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
index cd94eb2b704..d9e032f0a88 100644
--- a/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
+++ b/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
index 03378303122..78cf7aa02c9 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFCropWorkspace.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty # , WorkspaceUnitValidator
from mantid.kernel import Direction
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
index abb4c95648a..8016ee86d78 100644
--- a/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
+++ b/Framework/PythonInterface/plugins/algorithms/TOFTOFMergeRuns.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Direction, StringArrayProperty, StringArrayLengthValidator
from mantid.api import PythonAlgorithm, AlgorithmFactory, WorkspaceProperty, WorkspaceGroup
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py b/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
index 7e29d62fd2b..23c5f2ae52b 100644
--- a/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
+++ b/Framework/PythonInterface/plugins/algorithms/TestWorkspaceGroupProperty.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py b/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
index d8c47e65278..9a1b3caaca4 100644
--- a/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
+++ b/Framework/PythonInterface/plugins/algorithms/USANSSimulation.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
index bef0a617508..5b70ea7c7c1 100644
--- a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
+++ b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py b/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
index bf67e3507a6..4b481791eb1 100644
--- a/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
+++ b/Framework/PythonInterface/plugins/algorithms/VelocityAutoCorrelations.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py b/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
index 053df640969..bfb20763199 100644
--- a/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
+++ b/Framework/PythonInterface/plugins/algorithms/VelocityCrossCorrelations.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-branches,too-many-locals, invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
index 2e900d72505..1a1838ea2c5 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py b/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
index 3c527fb75e7..2ac15fcb195 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioPreFit.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py b/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
index 4410508417c..ea1221bc712 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from vesuvio.base import VesuvioBase
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py b/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
index 2e8e283f6c2..838497f8eae 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py b/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
index 933fff2a076..38af2e0fdd1 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioThickness.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Direction, FloatArrayProperty
from mantid.api import (PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/ViewBOA.py b/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
index e434c18f253..8162aa958f8 100644
--- a/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
+++ b/Framework/PythonInterface/plugins/algorithms/ViewBOA.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AlgorithmFactory
from mantid.api import PythonAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/VisionReduction.py b/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
index 059774b2774..331caed9313 100644
--- a/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/VisionReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
#from mantid.api import AlgorithmFactory
#from mantid.simpleapi import PythonAlgorithm, WorkspaceProperty
# from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
index b37888685b7..4af6349a0cf 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultiple.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
index 8dcc0bb1094..e7855f92bdc 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroupProperty, \
PropertyMode, MatrixWorkspace, Progress, WorkspaceGroup
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
index 3c7fdd0f6c6..4fc9d91cafc 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
from six import next
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
index 699c1a4ba9b..0dfe3e5d445 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesStretch.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
index aa6a54c5981..5ff2ba50326 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CalculateMonteCarloAbsorption.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, PropertyMode, WorkspaceGroupProperty,
Progress, mtd, SpectraAxis, WorkspaceGroup, WorkspaceProperty)
from mantid.kernel import (VisibleWhenProperty, PropertyCriterion, StringListValidator, IntBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
index f6a35cabbce..5af04c107d5 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ConvertMultipleRunsToSingleCrystalMD.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
index b63e2d672aa..31bca62a56d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeighting.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceUnitValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
index 8421e94002c..61c40765fbb 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShielding.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
index 0dedded20fe..8cf060771b8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectData.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, FileAction, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
index d32d5a396da..d1be09c8be4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnostics.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
index 66544e3aace..6519ee8079a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadium.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator, ITableWorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
index a9407cb0633..c0366f02f48 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
index 11b26505bff..bcf39c2890c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShielding.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import DirectILL_common as common
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, InstrumentValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
index 8e6d94ffc04..f59858b98a7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/DirectILL_common.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
ABSOLUTE_UNITS_OFF = 'Absolute Units OFF'
ABSOLUTE_UNITS_ON = 'Absolute Units ON'
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
index 07b7f4c8035..01b62ee6742 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSAzimuthalAverage1D.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import math
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
index 191383701f8..f2000bdb960 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSDirectBeamTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#Pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
index ed1532d1e37..dbd33336ec0 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/EQSANSNormalise.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
index 34ad391e366..f494bbd06b2 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import AppendSpectra, CloneWorkspace, ElasticWindow, LoadLog, Logarithm, SortXAxis, Transpose
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
index 71815d40ff0..1017e09ec3c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FindPeaksAutomatic.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantid.simpleapi import (ConvertToPointData, CreateWorkspace, DeleteWorkspace,
CreateEmptyTableWorkspace, FitGaussianPeaks)
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, WorkspaceProperty, Progress, ITableWorkspaceProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
index c5f5f9c6fa8..4465dd385c1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaks.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantid.simpleapi import (CreateEmptyTableWorkspace, Fit)
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, WorkspaceProperty, ITableWorkspaceProperty)
from mantid.kernel import (Direction, FloatBoundedValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
index 5185712cfee..1b58da33aea 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
from six import iteritems
from six import integer_types
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
index 01dcabe76d0..bf6218a4d2e 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/HFIRSANSReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as api
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
index dc0c9390ee4..b196bbec52d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ILL_utilities.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import DeleteWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
index 9c7253650ce..46c51377102 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
import os
from IndirectReductionCommon import load_files, load_file_ranges
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
index 360d2c196d4..594ee2f303a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransfer.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,deprecated-module
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
index 3a17e0c6b18..386f3ca1368 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapper.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,deprecated-module
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import (Direction, FloatArrayProperty, FloatBoundedValidator, IntArrayMandatoryValidator,
IntArrayProperty, Property, StringArrayProperty, StringListValidator)
from mantid.api import (AlgorithmFactory, AnalysisDataService, DataProcessorAlgorithm, FileAction, FileProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
index e9897f0f210..1128433da40 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress, WorkspaceGroupProperty
from mantid.kernel import (StringMandatoryValidator, Direction, logger, IntBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
index 2c4c3e16b40..f20f99ca995 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
PropertyMode, Progress, WorkspaceGroupProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
index dde63797fb7..5723cfb0b0a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCalibration.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
index ccb203631a5..6c2bd0d98b9 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, WorkspaceGroupProperty, PropertyMode, Progress
from mantid.kernel import (StringMandatoryValidator, Direction, logger, FloatBoundedValidator,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
index 48fda32f480..7d7bbdfb82e 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
WorkspaceGroupProperty, PropertyMode, Progress, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
index 1a38968706b..19c2e796aad 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScan.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
index ff96daf0257..61cde324b02 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-many-instance-attributes,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, PropertyMode, Progress, WorkspaceGroupProperty
from mantid.kernel import StringMandatoryValidator, Direction, logger, FloatBoundedValidator, MaterialBuilder, StringListValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
index 8db5610f711..666e7824838 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import SetBeam, SetSample, MonteCarloAbsorption, GroupWorkspaces
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
PropertyMode, Progress, WorkspaceGroupProperty, mtd)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
index 3f601a6fa45..74807247b71 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransfer.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
index 14d44c754fe..7588bba5057 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import time
from mantid import mtd
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
index 8aa7953c9b5..a856a1156d8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import numpy
from mantid import mtd
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
index ace858f77ef..edb029673aa 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResult.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.api import (AlgorithmFactory, AnalysisDataService, MatrixWorkspace, MatrixWorkspaceProperty,
PythonAlgorithm, PropertyMode, WorkspaceGroup)
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
index 77c0a9b0e18..1f85f9d7b2a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
index 9772aeeffa8..f79f718ac4a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
index b224bae32d1..943cdb271e8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IqtFitMultiple.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import logger, AlgorithmFactory
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
index c2af5e28821..8e1e73ad498 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherent.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
index 982335ab975..8faa69ec225 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
index 85937583480..6edbf73f9f0 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspaces.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (AnalysisDataService, CloneWorkspace, ConjoinWorkspaces, CropWorkspaceRagged,
DeleteWorkspace, MatchSpectra, Rebin, SumSpectra)
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, WorkspaceProperty, WorkspaceGroup, ADSValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
index 16a540fbf96..f02df5e68a1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MolDyn.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
index 86d9a2a703c..27f09164da4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatData.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
# Algorithm to start Bayes programs
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, AlgorithmFactory
from mantid.kernel import StringListValidator, StringMandatoryValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
index 634b2b2ff30..a28b8c35ea7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MuscatFunc.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
# Algorithm to start Bayes programs
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import StringListValidator, StringMandatoryValidator
from mantid.api import PythonAlgorithm, AlgorithmFactory
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
index d52c007137b..25b3ceb9763 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/NormaliseByThickness.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
index 7375fd46240..fef2fcf7a79 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import itertools
from IndirectReductionCommon import load_files
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
index 638eeb4b6bd..1a1f15dc9af 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PoldiDataAnalysis.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,attribute-defined-outside-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
index a2cbad2b926..9617fda958a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import CompositeValidator, Direction, FloatArrayLengthValidator, FloatArrayOrderedPairsValidator, \
FloatArrayProperty, StringListValidator, IntBoundedValidator
from mantid.api import DataProcessorAlgorithm, MultipleFileProperty, Progress, WorkspaceGroupProperty, FileProperty, FileAction
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
index 8d0d28f0cef..9ed9d96db60 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLEfficiency.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
import numpy.ma as ma
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
index 87f40ed5fb7..e95aefea1f7 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScan.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.kernel import StringListValidator, Direction, FloatArrayProperty, \
FloatArrayOrderedPairsValidator, VisibleWhenProperty, PropertyCriterion, FloatBoundedValidator
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
index 6db1669788d..0b7c9647271 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReactorSANSResolution.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import math
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
index cc3c087a191..19dfa7de0ca 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcess.py
@@ -5,11 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (
- absolute_import,
- division,
- print_function
-)
from mantid.api import (
AlgorithmFactory,
DataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
index c39d017a00e..44355ca216a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQ.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator)
from mantid.kernel import (Direction, FloatBoundedValidator, Property, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
index b2111a652f2..af704621e6f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCor.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, FileAction, FileProperty, mtd, WorkspaceGroupProperty)
from mantid.kernel import (CompositeValidator, Direction, StringArrayLengthValidator, StringArrayMandatoryValidator, StringArrayProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
index 578d64a36b0..95c99e42812 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocess.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory,
DataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
index 7f6d08dddd3..642e3880be4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForeground.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import ILL_utilities as utils
from mantid.api import (AlgorithmFactory, DataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode,
WorkspaceUnitValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
index 8bb711d0ece..4edaed1f5ac 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_common.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import UnitConversion, DeltaEModeType
from mantid.simpleapi import *
import scipy.constants as constants
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
index 332f171e74b..5ed00ee522e 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AlgorithmFactory, AnalysisDataService, DataProcessorAlgorithm,
WorkspaceGroup)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
index 3ae64957666..fa557dbd662 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ResNorm2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
WorkspaceGroup, WorkspaceGroupProperty, ITableWorkspaceProperty,
Progress, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
index 74e2de3e859..31586cc6b2f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py
@@ -8,8 +8,6 @@
""" Finds the beam centre for SANS"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid import AnalysisDataService
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
index e4939224bf2..1d19fa4223e 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
@@ -8,8 +8,6 @@
""" Finds the beam centre."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, Progress,
IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
index 6c75018d801..899c08ad040 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py
@@ -8,8 +8,6 @@
""" Finds the beam centre for SANS"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, Progress,
IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
index 9e39f0c47c6..e72921f5782 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py
@@ -8,8 +8,6 @@
""" SANSConvertToWavelengthAndRebin algorithm converts to wavelength units and performs a rebin."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
Progress)
from mantid.dataobjects import EventWorkspace
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
index f5b3d0d630c..ae938d52371 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSCreateAdjustmentWorkspaces.py
@@ -10,8 +10,6 @@
, wavelength adjustment and pixel-and-wavelength adjustment workspaces.
"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
WorkspaceUnitValidator)
from mantid.kernel import (Direction, StringListValidator, CompositeValidator)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
index 63355d2d456..cb46677d5f2 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
@@ -8,8 +8,6 @@
""" SANSLoad algorithm which handles loading SANS files"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
Progress, WorkspaceProperty)
from mantid.kernel import (Direction, FloatArrayProperty)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
index 71fccf9bbba..963a6a692b9 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py
@@ -8,8 +8,6 @@
""" SANSReductionCore algorithm runs the sequence of reduction steps which are necessary to reduce a data set."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import AlgorithmFactory, Progress
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
index fc4da011268..7d12afe5e1d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py
@@ -8,8 +8,6 @@
"""A base class to share functionality between SANSReductionCore algorithms."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DistributedDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode, IEventWorkspace)
from mantid.kernel import (Direction, StringListValidator)
from sans.algorithm_detail.CreateSANSAdjustmentWorkspaces import CreateSANSAdjustmentWorkspaces
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
index 2bcf3a12613..f2a29a7ffda 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py
@@ -9,8 +9,6 @@
""" SANSReductionCoreEventSlice algorithm runs the sequence of reduction steps which are necessary to reduce a data set,
for which data must be event sliced. These steps are: slicing, adjustment, convert to q."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
index a885277ff7c..9b1a359a364 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py
@@ -9,8 +9,6 @@
""" SANSReductionCorePreprocess algorithm runs the sequence of reduction steps which are necessary to reduce a data set,
which can be performed before event slicing."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSReductionCoreBase import SANSReductionCoreBase
from mantid.api import MatrixWorkspaceProperty, AlgorithmFactory, Progress
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
index 01b6b8383ad..afc584d96c6 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py
@@ -8,8 +8,6 @@
""" SANSSave algorithm performs saving of SANS reduction data."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode,
FileProperty, FileAction, Progress)
from mantid.kernel import (Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
index 67b78d9247f..32115667a40 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py
@@ -8,8 +8,6 @@
""" SANSSingleReduction algorithm performs a single reduction."""
-from __future__ import (absolute_import, division, print_function)
-
from SANSSingleReductionBase import SANSSingleReductionBase
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
index 2a115e7037c..c8c6c726ec1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py
@@ -8,8 +8,6 @@
""" SANSSingleReduction version 2 algorithm performs a single reduction on event sliced data."""
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from SANSSingleReductionBase import SANSSingleReductionBase
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
index ccabfaddb94..090b74d875a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py
@@ -8,8 +8,6 @@
"""A base class to share functionality between SANSSingleReduction versions."""
-from __future__ import (absolute_import, division, print_function)
-
from collections import defaultdict
from mantid.api import (DistributedDataProcessorAlgorithm,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
index c743c02c47d..6900bfa404c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAbsoluteScale.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
index 855ce3a734e..3370b855568 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSAzimuthalAverage1D.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import math
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
index 5f21b103604..da697dea302 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
index 74bcc04f28c..3babd3e2768 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-branches
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
index e5b2a5f9b12..8e5f354a2cd 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDirectBeamTransmission.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
index 5379df9e28b..b582ea326ad 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-arguments,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode, AnalysisDataService
from mantid.kernel import Direction, Property, StringListValidator, UnitFactory
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
index 5c8313556a7..94dcd52dbbe 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLAutoProcess.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import *
from mantid.kernel import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
index fc8c647dd23..d7743fc1f02 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegration.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, WorkspaceUnitValidator, WorkspaceGroupProperty, \
PropertyMode, MatrixWorkspace, NumericAxis
from mantid.kernel import EnabledWhenProperty, FloatArrayProperty, Direction, StringListValidator, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
index 33d6147704d..a79426fe393 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSILLReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, MultipleFileProperty, PropertyMode, Progress, WorkspaceGroup
from mantid.kernel import Direction, EnabledWhenProperty, FloatBoundedValidator, LogicOperator, PropertyCriterion, StringListValidator
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
index c4518727a29..45a434f7025 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSMask.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
index d33421d93da..e743400ce2a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSPatchSensitivity.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
index f220b7cc99b..654964f43e0 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSReduction.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
index cbf1d41da56..336cb75fcc3 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-arguments,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import *
from mantid.api import ParallelDataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode
from mantid.kernel import Direction, Property, StringListValidator, UnitFactory, \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
index 59274dec950..cd9261fed4c 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import mantid
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
index 6308e7f50b0..d92866716f4 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from six.moves import range #pylint: disable=redefined-builtin
import mantid.simpleapi as api
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
index 2d7ad054ffb..9b09faea727 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorption.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty, Progress)
from mantid.kernel import (VisibleWhenProperty, EnabledWhenProperty, Property, PropertyCriterion,
StringListValidator, IntBoundedValidator, FloatBoundedValidator, Direction)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
index 2f39927da80..531f2d551fc 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-lines, redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
index 309bbb32905..32a26f79452 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SingleCrystalDiffuseReduction.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (DataProcessorAlgorithm, mtd, AlgorithmFactory,
FileProperty, FileAction,
MultipleFileProperty, WorkspaceProperty,
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
index 0a6994d6c28..a20647f2383 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SwapWidths.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import (WorkspaceProperty,DataProcessorAlgorithm, AlgorithmFactory,
mtd, Progress)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
index 2cc4e2d362f..56176e796e8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrection.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
index 77fa091a73b..75cc3740606 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
index c56274516f6..3f898ea6462 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScattering.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (CalculatePlaczekSelfScattering, ConvertToDistribution, ConvertUnits, CreateWorkspace,
DeleteWorkspace, DiffractionFocussing, Divide, ExtractSpectra, FitIncidentSpectrum,
LoadCalFile, SetSample)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
index 9b2dfbc6379..94ad6afa49d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import (PythonAlgorithm, AlgorithmFactory, MatrixWorkspaceProperty,
ITableWorkspaceProperty, PropertyMode, Progress)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
index 1da362a7952..a84d0aa3994 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
from mantid.kernel import *
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
index bd1d0b06610..4e6279f0a57 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
index 88051eb8379..2ce441e9828 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReduction.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/dnsdata.py b/Framework/PythonInterface/plugins/algorithms/dnsdata.py
index 78b63467e9a..6e79a62c3fb 100644
--- a/Framework/PythonInterface/plugins/algorithms/dnsdata.py
+++ b/Framework/PythonInterface/plugins/algorithms/dnsdata.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import re
from dateutil.parser import parse
diff --git a/Framework/PythonInterface/plugins/algorithms/roundinghelper.py b/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
index c993044234a..73c421e6779 100644
--- a/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
+++ b/Framework/PythonInterface/plugins/algorithms/roundinghelper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Direction, StringListValidator
import numpy
diff --git a/Framework/PythonInterface/plugins/functions/BivariateGaussian.py b/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
index 1184c1e5a54..bc23e7dd44b 100644
--- a/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
+++ b/Framework/PythonInterface/plugins/functions/BivariateGaussian.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/ChudleyElliot.py b/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
index bba99c45589..b75d8a8c6d3 100644
--- a/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
+++ b/Framework/PythonInterface/plugins/functions/ChudleyElliot.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py b/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
index 7a2fee15b14..b4fb6f52a4d 100644
--- a/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
+++ b/Framework/PythonInterface/plugins/functions/DSFinterp1DFit.py
@@ -9,7 +9,6 @@
@author Jose Borreguero, NScD
@date October 06, 2013
'''
-from __future__ import (absolute_import, division, print_function)
import numpy
import scipy.interpolate
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py b/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
index 65293a4c5f0..c058cd15140 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffCylinder.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 07, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py b/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
index a8ad8207e85..bfe5bed44fb 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffSphere.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 05, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
try:
from scipy.special import spherical_jn
diff --git a/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py b/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
index 5d9c7afe4d9..2ea46cb9536 100644
--- a/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
+++ b/Framework/PythonInterface/plugins/functions/EISFDiffSphereAlkyl.py
@@ -9,8 +9,6 @@
@author Jose Borreguero, ORNL
@date December 06, 2017
"""
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
try:
from scipy.special import spherical_jn
diff --git a/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py b/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
index 40f9024e0d6..f0c0f120944 100644
--- a/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
+++ b/Framework/PythonInterface/plugins/functions/Examples/Example1DFunction.py
@@ -15,7 +15,6 @@ to have meaningful concepts such as this then see ExamplePeakFunction.
1D functions do not have to have a derivative defined, if they do not then they will use a numerical
derivative
"""
-from __future__ import (absolute_import, division, print_function)
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py b/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
index 430587e7e37..a44eead5d7c 100644
--- a/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
+++ b/Framework/PythonInterface/plugins/functions/Examples/ExamplePeakFunction.py
@@ -14,7 +14,6 @@ It uses the so-called IPeakFunction that should be used when there is a sensible
calculate the centre, height & fwhm of the function. If it does not make sense, for example a in linear background,
where does not give a peak shape, then see the more general Example1DFunction that does not require these concepts.
"""
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IPeakFunction, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/FickDiffusion.py b/Framework/PythonInterface/plugins/functions/FickDiffusion.py
index bc599951d58..11591fbdafd 100644
--- a/Framework/PythonInterface/plugins/functions/FickDiffusion.py
+++ b/Framework/PythonInterface/plugins/functions/FickDiffusion.py
@@ -10,7 +10,6 @@
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Guinier.py b/Framework/PythonInterface/plugins/functions/Guinier.py
index 46f8ae86e17..6f0e49bc6fe 100644
--- a/Framework/PythonInterface/plugins/functions/Guinier.py
+++ b/Framework/PythonInterface/plugins/functions/Guinier.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 10, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/GuinierPorod.py b/Framework/PythonInterface/plugins/functions/GuinierPorod.py
index 4146d630c7e..25e7a5da67d 100644
--- a/Framework/PythonInterface/plugins/functions/GuinierPorod.py
+++ b/Framework/PythonInterface/plugins/functions/GuinierPorod.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/HallRoss.py b/Framework/PythonInterface/plugins/functions/HallRoss.py
index df80753cdea..32ff6f09f62 100644
--- a/Framework/PythonInterface/plugins/functions/HallRoss.py
+++ b/Framework/PythonInterface/plugins/functions/HallRoss.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/ICConvoluted.py b/Framework/PythonInterface/plugins/functions/ICConvoluted.py
index 97fc3e7263f..b44e9952f56 100644
--- a/Framework/PythonInterface/plugins/functions/ICConvoluted.py
+++ b/Framework/PythonInterface/plugins/functions/ICConvoluted.py
@@ -11,7 +11,6 @@
# a square wave and a Gaussian.
#
#
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Lorentz.py b/Framework/PythonInterface/plugins/functions/Lorentz.py
index 7ec0240cded..9c0b62f7706 100644
--- a/Framework/PythonInterface/plugins/functions/Lorentz.py
+++ b/Framework/PythonInterface/plugins/functions/Lorentz.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/MsdGauss.py b/Framework/PythonInterface/plugins/functions/MsdGauss.py
index 41c38ec0d56..e442427688d 100644
--- a/Framework/PythonInterface/plugins/functions/MsdGauss.py
+++ b/Framework/PythonInterface/plugins/functions/MsdGauss.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/MsdPeters.py b/Framework/PythonInterface/plugins/functions/MsdPeters.py
index 62ab90e01b1..272de8b4974 100644
--- a/Framework/PythonInterface/plugins/functions/MsdPeters.py
+++ b/Framework/PythonInterface/plugins/functions/MsdPeters.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import math
import numpy as np
diff --git a/Framework/PythonInterface/plugins/functions/MsdYi.py b/Framework/PythonInterface/plugins/functions/MsdYi.py
index 137eaea4417..e773b625605 100644
--- a/Framework/PythonInterface/plugins/functions/MsdYi.py
+++ b/Framework/PythonInterface/plugins/functions/MsdYi.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/Porod.py b/Framework/PythonInterface/plugins/functions/Porod.py
index e29a5c97579..762aff10511 100644
--- a/Framework/PythonInterface/plugins/functions/Porod.py
+++ b/Framework/PythonInterface/plugins/functions/Porod.py
@@ -9,7 +9,6 @@
@author Mathieu Doucet, ORNL
@date Oct 13, 2014
'''
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py b/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
index 6b173fda85b..d27c30e2bc5 100644
--- a/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
+++ b/Framework/PythonInterface/plugins/functions/PrimStretchedExpFT.py
@@ -11,7 +11,6 @@
@date June 01, 2017
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/StretchedExpFT.py b/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
index 3def86307f0..4c2675f9d08 100644
--- a/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
+++ b/Framework/PythonInterface/plugins/functions/StretchedExpFT.py
@@ -11,7 +11,6 @@
@date October 06, 2013
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py b/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
index 9d9280e2a2f..b2d18abb952 100644
--- a/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
+++ b/Framework/PythonInterface/plugins/functions/StretchedExpFTHelper.py
@@ -13,7 +13,6 @@
This module provides functionality common to classes StretchedExpFT and PrimStretchedExpFT
"""
-from __future__ import (absolute_import, division, print_function)
import copy
from scipy.fftpack import fft, fftfreq
from scipy.special import gamma
diff --git a/Framework/PythonInterface/plugins/functions/TeixeiraWater.py b/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
index f047c648243..72f8d7fc042 100644
--- a/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
+++ b/Framework/PythonInterface/plugins/functions/TeixeiraWater.py
@@ -9,8 +9,6 @@
@author Spencer Howells, ISIS
@date December 05, 2013
'''
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from mantid.api import IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
index 8616c4eb5fd..5946b9240df 100644
--- a/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/FitFunctionsTest.py
@@ -7,8 +7,6 @@
"""
Test of fitfunctions.py and related classes
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
diff --git a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
index 79b98ee2870..6c36eeae2ec 100644
--- a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmFactory
diff --git a/Framework/PythonInterface/test/python/mantid/PVPythonTest.py b/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
index 2549fdcb882..7b8e006086c 100644
--- a/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
+++ b/Framework/PythonInterface/test/python/mantid/PVPythonTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from paraview.simple import *
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
index e759c2a3f66..bdba68e6fd7 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
@@ -7,8 +7,6 @@
"""
Specifically tests the Fit function in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
index 5c23b5ce43f..ce4efeea51e 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
@@ -7,8 +7,6 @@
"""
Specifically tests the Load function in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, LoadDialog
from mantid.api import mtd, MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
index 992ff4e7fa3..8fb4c8853c2 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
@@ -7,8 +7,6 @@
"""
Specifically tests the RenameWorkspace algorithm in the simple API
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
import platform
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
index e35c8fa0360..3494e2105bc 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py b/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
index 7cf1b0b6cd0..04e5f7f1d9f 100644
--- a/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/_plugins/ProductFunctionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
# from mantid.kernel import DateAndTime
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
index 67b6c5e9f34..62979372eef 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryObserverTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
import sys
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
index 0af3a2b856e..5612e88b039 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
index 30c8f8e6960..9415e58f953 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateWorkspace, set_properties
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, AlgorithmManager,
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
index 9fa5ca60cbc..7b1b53b41d6 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import (AlgorithmManager, Algorithm, AlgorithmProxy,
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
index 9452ae0ccbd..016b7886a91 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmProperty, FrameworkManagerImpl, IAlgorithm
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
index f0b0ef30801..e0239da7203 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import six
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
index 90c0e5f4a8f..ad42cd82cc5 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.api import AnalysisDataService as ADS, AnalysisDataServiceObserver
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
index 3ecb6b16a71..c64b6fe1449 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import six
import unittest
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
index 1a69080a3dd..bc09f589676 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import NumericAxis, SpectraAxis, TextAxis, mtd
diff --git a/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
index a0496c6c1b2..aba7fe17216 100644
--- a/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/CatalogManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py b/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
index 16b78067c6b..87a4a93eba1 100644
--- a/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/CompositeFunctionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FrameworkManagerImpl, FunctionFactory, CompositeFunction, IFunction1D
diff --git a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
index 31bee3311c5..08959d1007e 100644
--- a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
from mantid.api import (Algorithm, DataProcessorAlgorithm, AlgorithmFactory,
diff --git a/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py b/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
index 3b835a41fd3..ca0919e86c8 100644
--- a/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/DeprecatedAlgorithmCheckerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import DeprecatedAlgorithmChecker, FrameworkManagerImpl
diff --git a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
index c97d362966f..a8cbe57861f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
###############################################################################
# This has to be tested through a workspace as it cannot be created in
diff --git a/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py b/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
index cab2bb7ae26..0eadff0be57 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FileFinderTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
index cc7459dbac3..b0fcf620873 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FilePropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FileProperty, FileAction, FrameworkManagerImpl
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
index add99b12ca7..28aeff02d09 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import FrameworkManager, FrameworkManagerImpl, IAlgorithm, AlgorithmProxy
diff --git a/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
index 12e0f1a50fd..d6c7a5da7e7 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FunctionFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FrameworkManagerImpl, IFunction1D, FunctionFactory
diff --git a/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
index 9d9b20383e9..044c9d7e5dc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FunctionPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import FrameworkManagerImpl, FunctionProperty, PythonAlgorithm, IFunction
from testhelpers import assertRaisesNothing
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
index fe8f99db7b0..cb4ef3f5521 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm, can_be_instantiated, WorkspaceCreationHelper
diff --git a/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py b/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
index 7519e19df14..66424bd6e0f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IFunction1DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import IFunction1D, IFunction, FunctionFactory
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
index 21d07404733..3c0bd67f9b0 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService, IMaskWorkspace
from testhelpers import run_algorithm, WorkspaceCreationHelper
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
index 5e35f5b4cc9..13487961b0e 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import *
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
index b70d1657823..6ada3160ecc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm, WorkspaceCreationHelper
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
index 46a88016621..49b08f6a65f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.kernel import std_vector_str
diff --git a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
index e9b23083f73..242376669d5 100644
--- a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Jacobian
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
index 19210617689..0e9304cfd52 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid import mtd
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
index 2347b99b8b7..65e8d80d7e9 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.kernel import VMD
from mantid.geometry import IMDDimension
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
index b15eb400f70..6b62bfe4aeb 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid import mtd
diff --git a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
index 57dfbf4b1c8..a060e365b86 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
import sys
import math
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
index 585a0a7d2de..fc04e994294 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import WorkspaceCreationHelper
from mantid.api import ExperimentInfo
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
index dc0408a761c..3ec4742a006 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MultipleFileProperty, mtd
from testhelpers import create_algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
index ef8ee103714..58fd5ee8d98 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Progress,PythonAlgorithm
from mantid.kernel import ProgressBase
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
index cef2eb0f3f1..632ad1864a4 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import Projection
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
index af4b2eb404f..95fa9b8ecbb 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmChildAlgCallTest.py
@@ -7,8 +7,6 @@
"""A test for the simple API dedicated to Python algorithms. Checks
things like Child Algorithm calls
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
index 8267e70957b..76cee5b4136 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmPropertiesTest.py
@@ -7,8 +7,6 @@
"""Defines tests for the simple property declarations types within
Python algorithms
"""
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
index 79a5f4df635..f3d0cb90424 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
@@ -7,8 +7,6 @@
"""Defines tests for the traits within Python algorithms
such as name, version etc.
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
index b2b502da7f0..1fb1f764eb4 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
@@ -7,8 +7,6 @@
"""Defines tests for the WorkspaceProperty types within
Python algorithms
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
index 39dfe76c7c9..36c3b873218 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunTest.py b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
index 4361d892741..34a9e52b75a 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import copy
from mantid.geometry import Goniometer
diff --git a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
index 8f7bde6ded0..845075019e5 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SampleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CreatePeaksWorkspace, CreateWorkspace, SetSampleMaterial, SetUB
from mantid.geometry import CrystalStructure, CSGObject, OrientedLattice
diff --git a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
index bcaee8d1ab3..0d23a2d9951 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import WorkspaceCreationHelper
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
index 210adde80d7..b7f101a1726 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceBinaryOpsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import CreateSampleWorkspace
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
index f992cf33bca..b53574c97c3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import (WorkspaceFactory, WorkspaceFactoryImpl, MatrixWorkspace,
ITableWorkspace, IPeaksWorkspace)
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
index 49c0a475819..84a49970b7a 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import six
import unittest
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
index 9dbfa8f5a29..5d5c5f4776e 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceHistoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load
from mantid import mtd, FileFinder
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
index 10be3193855..3bb56e80c62 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
@@ -7,8 +7,6 @@
"""Tests the construction of the various workspace
property types
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.api import (WorkspaceProperty, WorkspaceGroupProperty, MatrixWorkspaceProperty,
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
index 8e4a42b6d84..118e84fa876 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import Workspace
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
index 6ffb7d71c1b..992863aad49 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceUnaryOpsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import CreateMDHistoWorkspace
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
index e3020a432e2..cb8dca1b767 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
@@ -7,8 +7,6 @@
"""
Test construction of the WorkspaceValidators
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import IValidator
diff --git a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
index ee3c635b5f7..df5032a6f32 100644
--- a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
+++ b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py b/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
index 5657c4dc616..116919be86b 100644
--- a/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/dataobjects/Workspace2DPickleTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
try:
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
index de7d689c6c7..b3e71c8ab73 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import BoundingBox
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py b/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
index 9c97836f048..20b5d087751 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/CSGObjectTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import BoundingBox, CSGObject
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
index 3cb254ff671..27ca0e107fa 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import argparse
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py b/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
index f66b1a93d8b..ab8ed7a3fe3 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/CrystalStructureTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods,broad-except
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import CrystalStructure
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
index f9377c7ab4b..ea97f1618a2 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from testhelpers import WorkspaceCreationHelper
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
index ae195e5f624..c496dcbefe0 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
from mantid.geometry import Goniometer
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
index 106f95593f6..7d267bc5220 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import Group, SpaceGroupFactory, PointGroupFactory, UnitCell
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
index 020fd91b00e..c16f38e3c4f 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import can_be_instantiated
from mantid.geometry import IComponent
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py b/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
index 12be77ca21e..d5cb00f7205 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/InstrumentTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
from mantid.geometry import(Detector, Instrument, ObjComponent, ReferenceFrame)
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
index 31a56890a34..a9f0b63be31 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.geometry import OrientedLattice, UnitCell
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
index 8cf57179d18..556b4c4aac5 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreatePeaksWorkspace, CreateSampleWorkspace
from mantid.geometry import PeakShape
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
index 37c84b401b0..15e3038504e 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PointGroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import PointGroup, PointGroupFactory
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
index d6f141e338e..2e6e1d5fe88 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import *
from testhelpers import can_be_instantiated, WorkspaceCreationHelper
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
index 0c7d23661c0..ffca2a01ac7 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import ReferenceFrame
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
index 21521d51928..19d2f8ae368 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ReflectionGeneratorTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import CrystalStructure, ReflectionGenerator, ReflectionConditionFilter
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
index 54c8eb51bb6..78379abdc7b 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SpaceGroupTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SpaceGroupFactory, UnitCell
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
index 2454749ea78..8199d793e10 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.geometry import SymmetryElement, SymmetryElementFactory
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
index ba0e3d53035..76a8250e9fe 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.kernel import V3D
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
index 98fcf086ba3..34f3aebce16 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.geometry import UnitCell, AngleUnits
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
index 6b850963a4b..721f7b2c888 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
index e771606e334..d5695c5e8c7 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
index 3e12f5ec7bf..645ca5f61b5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayOrderedPairsValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
index 38b53f8bf13..4baebf00cb7 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test the exposed ArrayProperty
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import (FloatArrayProperty, StringArrayProperty, IntArrayProperty, Direction,
NullValidator)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
index bcd2bc121f6..6446ab2e5f2 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatBoundedValidator, IntBoundedValidator
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
index 84f8ad1d83b..85b7a5d8e16 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import CompositeValidator, CompositeRelation, FloatBoundedValidator
from mantid.api import PythonAlgorithm
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index fbeb78d81a9..31e3bb1461b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import inspect
import os
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py b/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
index 7affe0c9548..03e70b9b859 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/DateAndTimeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
import numpy
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
index d0216dff6d6..75544bc6f2f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DeltaEMode, DeltaEModeType
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
index 2b64b8987f5..e267c4b312f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/EnabledWhenPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import EnabledWhenProperty, PropertyCriterion, LogicOperator
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
index 61e4f5fec6d..3d940a29fea 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import FacilityInfo, InstrumentInfo, ConfigService
import pytz
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
index dd1b037e587..0708f4fea84 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import BoolTimeSeriesProperty, FloatTimeSeriesProperty, FloatFilteredTimeSeriesProperty
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
index be7226f80e6..3802a3b95d5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import IPropertySettings
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
index 973f0146c1d..08d8edd0902 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import InstrumentInfo, ConfigService
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
index 2ee79e9f85c..bad945c58bd 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
index 8a3c3686c62..37926bbb786 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import LiveListenerInfo, ConfigService
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
index f94c213dc9a..3244e5bc631 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LogFilterTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import LogFilter, FloatTimeSeriesProperty, BoolTimeSeriesProperty
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
index 20fc806ed96..a18627236d1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LoggerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import Logger
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
index 05bfebbd433..93525c81cd1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import FloatArrayProperty, StringMandatoryValidator, FloatArrayMandatoryValidator
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
index 9183dc69332..b22b6614783 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MaterialBuilderTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import MaterialBuilder, NumberDensityUnit
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
index 573f2115729..c95e18d634a 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import MemoryStats
import sys
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
index c8c45bf9f54..41b6df0e323 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
from mantid.kernel import NullValidator
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
index 629c0fa81de..43c4043d62a 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import Direction, OptionalBool, OptionalBoolValue, OptionalBoolPropertyWithValue
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
index 28f345745a7..19a394e7fc6 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import ProgressBase
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
index 3b838d84f29..0a4322f584f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyHistoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyHistory
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
index 52867a84579..f4540fd9ee5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import PropertyManager, PropertyManagerDataService
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
index 60f2c35bc46..2cfb9c21ecf 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test the exposed PropertyManagerProperty
"""
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManagerProperty, Direction, PropertyManager
from mantid.api import Algorithm
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
index ebd111a8721..bc3c79cf3fd 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManager, IPropertyManager
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
index d4ee387013b..07c0135aaaa 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyWithValueTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, MatrixWorkspace
from mantid.kernel import Property, StringPropertyWithValue
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
index 4ee81cc12af..9f4a36eaf2b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import shutil
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
index 917a9e4997c..cf37a728dba 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import math
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
index 6100b3d83f8..7707ac5e587 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/RebinParamsValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
index 33bfd035d73..1444d5fd303 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import Stats
import math
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
index 19467543e8c..0dcab12e2fc 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import testhelpers
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
index 8050d3ca3c8..91f069b64ee 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
index c17e14382c2..3613cb4f2c8 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitConversion, DeltaEModeType
import math
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
index 155d5eb0cc8..8c9024c11dc 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, UnitFactoryImpl, Unit
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index 620f1318740..9cdf35d3f55 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, UnitLabel
import six
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
index 763649525f0..26e9dafe79e 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import UnitFactory, Unit, Label, UnitLabel
import types
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
index 20d142b1954..667fc2d32d8 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UsageServiceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.kernel import (UsageService, UsageServiceImpl, FeatureType)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py b/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
index 7d244e58a71..8d832124986 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/V3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import math
import numpy as np
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
index 08a11943452..fc5253f40b1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
from mantid.kernel import VMD
import math
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
index 6ffd0a876be..7b590581558 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/VisibleWhenPropertyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import VisibleWhenProperty, PropertyCriterion, LogicOperator
diff --git a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
index 7e283244c04..e3e72437072 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
@@ -11,8 +11,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from matplotlib.scale import scale_factory
diff --git a/Framework/PythonInterface/test/python/mantid/plots/__init__.py b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/__init__.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py b/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
index 2701d1a1f81..01f4a653f2f 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/axesfunctions3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import matplotlib
matplotlib.use('AGG')
diff --git a/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
index c5be1f8b438..686fcd37ba3 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/axesfunctionsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
index 0a1bd9c1fb6..6ff6108c5cd 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import unittest
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
index 781ba2262e2..139b6f18346 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('AGG') # noqa
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
index c353487052f..b20621e7ac6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsAdvancedParametersTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import Abins, DeleteWorkspace, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
index b948729aff2..6bb02c6ecb9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid import logger
# noinspection PyUnresolvedReferences
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
index e8a8ad6cd38..6a5f228e017 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import AlignComponents, CreateSampleWorkspace, MoveInstrumentComponent, CreateEmptyTableWorkspace, mtd, RotateInstrumentComponent
from mantid.api import AlgorithmFactory
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
index a64f1c5ac83..4bc6d7e8e1e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsSingleAxis
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
index c6e3af1188f..f2c74a3159f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsTwoAxes
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
index 0cf1087c7dc..5dd6948528c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ApplyDetectorScanEffCorrTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
index 097cb6c6a70..8931ae384ac 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/BinWidthAtXTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace
import numpy
import sys
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
index 539754e9186..b9c9435d1d5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateEfficiencyCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import \
CalculateEfficiencyCorrection, CloneWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
index d6e15113af1..8c4881e9adc 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CalculateFlux, CreateSampleWorkspace, FindDetectorsInShape, mtd
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
index c0477f6a42f..f95dd132fed 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateSampleTransmissionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import CalculateSampleTransmission
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
index 71884672bb0..991853836c2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CheckForSampleLogsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
index b7627588e10..952637ae021 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,multiple-statements
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
index 4a3eb111852..605cfc6ea8c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CompareSampleLogsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
index 55e35b84207..94c1c51f055 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeCalibrationCoefVanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import FloatTimeSeriesProperty
from mantid.simpleapi import (DeleteWorkspace, CreateSampleWorkspace,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
index d4b47cb288f..d535fa80355 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (AddSampleLog, ComputeIncoherentDOS, CreateSampleWorkspace, CreateWorkspace, LoadInstrument, ScaleX, Scale,
SetInstrumentParameter, SetSampleMaterial, SofQW3, Transpose)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
index 23c7375ce2d..a9c56cd90c2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
index 56ed13a02d0..fe65ce75e1e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
index 277ad2d115e..9adf08f1dd6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CloneWorkspace, GroupWorkspaces, AddSampleLogMultiple, CreateEmptyTableWorkspace
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
index b2bb8550871..4393459cfca 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
index 4aa8f1d5e07..a8d77cfdd7d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
index d7a48126f7d..a79439c21fe 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, AnalysisDataService
from mantid.simpleapi import CreateWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
index d1fdbd1e591..3d7bb861fd1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest,os
from mantid.simpleapi import CreateSampleWorkspace, CropWorkspaceForMDNorm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
index e5349805653..7908d145c6c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceRaggedTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi as api
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
index 0d5452bfbb9..4cd372d7b43 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CylinderPaalmanPingsCorrection2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import mtd, config
from mantid.simpleapi import (CreateSampleWorkspace, Scale, DeleteWorkspace, ConvertToPointData,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
index 5644a024a4b..bd3f37012cf 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSComputeDetEffCorrCoefsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
index 5a09f871aa7..4d8179e9fe5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSFlippingRatioCorrTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
index fe6299dba2a..79a61854675 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DNSMergeRunsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from testhelpers.mlzhelpers import create_fake_dns_workspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
index 4dc898534b5..04e94219bcd 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest,os
import mantid
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
index d73496d8e70..15d749d9c02 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DakotaChiSquaredTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
index b69569c2b58..e6aa4308ec5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DeltaPDF3DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import DeltaPDF3D, CreateMDWorkspace, FakeMDEventData, BinMD, mtd
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
index 3ac664875ee..fdd1da0de6b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
index 8b74419fce5..9bb4c0b7519 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
index a535fc9f414..ef03a9c67eb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
index b6c8ada02ef..cba5e65da66 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFitTOFFromPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
index c5fbd57010f..db2b740c757 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggFocusTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
index 9c6cc4ede04..df3004094ea 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveGSASIIFitResultsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import os
import random
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
index b01576d645b..7cc81ccc111 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggSaveSinglePeakFitResultsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import os
import random
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
index 24f6b2bd1e8..4d3fbffad26 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import *
import mantid.simpleapi as sapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index 6ae58e9127c..f25e7924812 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from numpy import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
index f103669dcfa..7d8632f3c1c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
import mantid.kernel as kernel
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
index 480e8a94f9c..96685ce7b0b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToHDF5Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import h5py
import numpy as np
import os
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
index e89707adee8..7e72623d9ad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import sys
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
index bfd2ffac5e3..8d6a437cc04 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
index d5fa9a181e9..a76bc338ef2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
index 27cdc9c6ef0..893384bfe24 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import FitGaussian, CreateSampleWorkspace, DeleteWorkspace
import logging
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
index 2dfa372c376..63ed99d7a7d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FitIncidentSpectrumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import AnalysisDataService, FitIncidentSpectrum, CalculateEfficiencyCorrection, CloneWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
index 6bee61f04d8..dc1a69dd373 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/GetEiT0atSNSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
index cb40e25fd0b..374d4328b58 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/HFIRSANS2WavelengthTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import HFIRSANS2Wavelength, CreateWorkspace, AddSampleLog, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
index 3bf384766c4..6a40bcf13d3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/IndirectTransmissionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import IndirectTransmission
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
index 9d646a83107..3ece6adf16a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LRPeakSelection, CreateSampleWorkspace, DeleteWorkspace
import logging
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
index 7bb064bb6ef..4403c6bd24e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadAndMergeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
from mantid.simpleapi import LoadAndMerge, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
index 981f28b4233..81f900d1cf5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-many-public-methods,invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
index d0eea6fad53..83711289974 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadDNSLegacyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
index 660f72f8b83..00bd8eefa79 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
index 4aaa8668203..ebcc8cfb6e3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
index f5be53822bd..71be425e6ef 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadGudrunOutputTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import LoadGudrunOutput, Workspace
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
index ed8a24d0d86..dce1e20a1d9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLampTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import config, mtd, LoadLamp
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
index 1bfb77979e3..fca072b42a8 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
index 6c65286de65..0a8a07fa507 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
index 5569ed64e9c..6a410fec5cd 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
index d06a22c3061..276cc805792 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
index 78a68b5cf79..d87ed16bba3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNMoldyn4Ascii1D, config
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
index 54c6c43507f..b2110e3e036 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
index 93b53b25af8..873d9b3cf96 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskAngleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
index 4cbeac2717c..5fe8932a89d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskBTPTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
index 88a362c3db2..4017020d11d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
index 7d13a6a4d19..c9f360be90e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MatchPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
index ecc460b8a18..5f3bc5c1c1a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MatchSpectraTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace, DeleteWorkspaces, MatchSpectra, mtd
import numpy as np
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
index aa891036ce8..41c5c0c5b32 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
index d9f6792bdd0..1eb15383c71 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MedianBinWidthTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateWorkspace, DeleteWorkspace
import numpy
import testhelpers
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
index d122ea39de7..c4f3b9b15dd 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import tempfile
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
index 1ff9fd20a37..8f69594236f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MuonMaxEntTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import numpy as np
import math
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
index 965e28ee9fb..1e64b12c9ea 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
index 6b2d8713e8f..769d32655ee 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
index f37ab7d447a..e1083e95265 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/OptimizeCrystalPlacementByRunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadIsawPeaks, FindUBUsingFFT, IndexPeaks, OptimizeCrystalPlacementByRun
from mantid.api import mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
index 6d42d188aa4..da90581aed2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertRealSpaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateWorkspace,
SetSampleMaterial,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
index b2bbf15c406..c9434f3233d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PDConvertReciprocalSpaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateWorkspace,
SetSampleMaterial,
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
index 2bfa2f5f42a..f98ad8e228d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiCreatePeaksFromFileTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from testhelpers import assertRaisesNothing
from testhelpers.tempfile_wrapper import TemporaryFileHelper
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
index 0d88c34962f..5ecdad32819 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
index 88de096dec1..f27f5bf5d6c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometryReductionOneLiveDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
index 09dc3aeb622..1e0a1d4192f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ReflectometrySliceEventWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
index 76ac755af64..ace42ad702e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
index d7e2b738dff..06f08d1fa75 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
index b1e18b13c15..075d3dfa95a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
index 7417e5168f6..1513beb7129 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveGEMMAUDParamFileTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
index 343a56aa487..51a4daaefb0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.api import AnalysisDataService
from mantid.simpleapi import CreateWorkspace, SaveNexusPD
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 19f6604db16..01d01042def 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
index 07e92a131c3..064be1122af 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveYDATest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from mantid.api import mtd
from mantid.simpleapi import CreateWorkspace, CreateSampleWorkspace, SaveYDA, ConvertSpectrumAxis, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
index 15626706d52..eda7844c4e1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=unused-import
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
index df82657a0a2..ed984813e6e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SetDetScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
index 0f3f2d420f5..52162c418c5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SortByQVectorsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import AnalysisDataServiceImpl, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
index 55dad049014..f2cb0b3c372 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SortDetectorsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
index 90d127dcb1f..84a29c44d49 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/StatisticsOfTableWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
index e426fbe4aaf..3f7eb6fd0f7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/StringToPngTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
index 52288a25abd..aee0e859869 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibCNCSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
index 65e8b7b023e..dc67530277e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SuggestTibHYSPECTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import simpleapi
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
index 3e4bd6c2a9f..0ff3d3c13d7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
index f06b7d4f40c..1a1ae707c82 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFCropWorkspaceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, DeleteWorkspace, GroupWorkspaces, TOFTOFCropWorkspace
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
index 92f0bca8ea4..8cf974ac209 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/TOFTOFMergeRunsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import Load, DeleteWorkspace, AddSampleLogMultiple, \
DeleteLog
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
index 58bb7741446..3df7b9c6160 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
index 42c65df7669..ad21dabc24a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import VelocityAutoCorrelations
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
index 5fc2f0268c8..4f32929d7a6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import VelocityCrossCorrelations
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
index 354f44d5cf3..e3e1bb91384 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
@@ -11,7 +11,6 @@ Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
from mantid.api import AlgorithmManager
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
index a3998c9cdde..47accbe218e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
index a6cf2e405ac..55127d93280 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
@@ -10,7 +10,6 @@ Unit test for Vesuvio reduction
Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
index 0a42d1bbf18..e203cef5460 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioThicknessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
index 19883d21d72..fcd8dd014df 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/AddSampleLogMultipleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
index 313324a48e2..265790cace6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
index 1641351d779..f2dc01ae919 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesQuasiTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
index 658ba4be7c3..d00a4118d55 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/BayesStretchTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import platform
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
index 75eec44d2c3..6b0f3df608f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DetectorFloodWeightingTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager
from mantid.simpleapi import CreateSampleWorkspace, DeleteWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
index 7403e418018..0363e53e163 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLApplySelfShieldingTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (mtd)
from mantid.simpleapi import (CloneWorkspace)
import numpy.testing
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
index e53a69d7816..547eba76e85 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLCollectDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
import numpy.testing
from testhelpers import assert_almost_equal, illhelpers, run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
index f21b83c6787..f6e604117ef 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLDiagnosticsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import illhelpers, run_algorithm
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
index 15da84bc444..84090078529 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLIntegrateVanadiumTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import (CloneWorkspace, FindEPP)
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
index 01685333b1c..5c61da56e7d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import collections
from mantid.api import mtd
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
index 39ed6f27d65..8b798131b0c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/DirectILLSelfShieldingTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from testhelpers import assert_almost_equal, illhelpers, run_algorithm
from mantid.api import mtd
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
index 8b66a39092b..d7f3b11e22c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/EnergyWindowScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import EnergyWindowScan
from mantid.api import mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
index 7f43c96386f..9d571e341a9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import numpy as np
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
index 14084604e46..868d33483b5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import mtd, config
from mantid.simpleapi import CreateSampleWorkspace, Scale, DeleteWorkspace, ConvertToPointData, \
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
index d447069f410..6b8b5118fa9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectDiffractionReductionTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
index 452a02eb9f8..cfea3948b80 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
index ec9ce0787a9..4da20de2abf 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ISISIndirectEnergyTransferWrapperTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CreateSimulationWorkspace, CreateWorkspace, CompareWorkspaces, DeleteWorkspace,
ISISIndirectEnergyTransfer, ISISIndirectEnergyTransferWrapper)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
index ce39323af56..58caaf2a6c0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectAnnulusAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
index 654ba6c2ad2..edbccbaf8ba 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectAnnulusAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectAnnulusAbsorption
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
index 209eed919cb..ce9388e5131 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCalibrationTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import IndirectCalibration
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
index f4eb642c1f0..56aae7ec227 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectCylinderAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
index 89b3877877b..92e9933deb1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectCylinderAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectCylinderAbsorption
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
index e4c297774fc..e4dcb2d6f69 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectDiffScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
index b8acb738915..e9f9ded90e4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorption2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectFlatPlateAbsorption, DeleteWorkspace
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
index d69e5744354..7a46c20d038 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectFlatPlateAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import LoadNexusProcessed, IndirectFlatPlateAbsorption
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
index 6013f355ccb..1815ac0eb3d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLEnergyTransferTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
index e4f640d6501..9fa3f1d4cdf 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import mtd
from testhelpers import run_algorithm
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
index 3a5f5529ca8..d92d0dc8524 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
index 59aeda0b374..7bfe6e60a72 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectReplaceFitResultTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CompareWorkspaces, ConvolutionFitSequential, ConvolutionFitSimultaneous, LoadNexus,
IndirectReplaceFitResult, RenameWorkspace)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
index 03302ce561f..df813d85c93 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid
from mantid.simpleapi import IndirectResolution
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
index fffa277cbaf..e08fdb0504b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectSampleChangerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AnalysisDataService
from mantid.simpleapi import IndirectSampleChanger
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
index 380b1101990..b1a7596dc88 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTransmissionMonitorTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import os
import mantid
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
index 6612f157f2e..43497782708 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectTwoPeakFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AnalysisDataService, MatrixWorkspace, WorkspaceGroup)
from mantid.simpleapi import (CompareWorkspaces, EnergyWindowScan, IndirectTwoPeakFit, LoadNexus)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
index 7c1a82a555e..8bf64c22629 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitMultipleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup, ITableWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
index 731bb44d8cb..29d716a2763 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IqtFitSequentialTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup, ITableWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
index db0ae9ce85e..2ffd887eed8 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MDNormSCDPreprocessIncoherentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import MDNormSCDPreprocessIncoherent
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
index b01d906598f..3080ba107df 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MSDFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, MSDFit
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
index 744f4b4eb62..f9131a1b5f6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MatchAndMergeWorkspacesTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from mantid.api import MatrixWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
index f4ee79bc320..afcfc967c22 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/MolDynTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
from mantid.simpleapi import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
index f7daafc8d89..addef04b82f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
index f7d28e0ef17..64f38c9ab2e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLDetectorScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
from mantid.simpleapi import PowderILLDetectorScan, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
index bf3871fb6e5..f8081333ca5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/PowderILLParameterScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import PowderILLParameterScan
from mantid import config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
index b4a46c03afc..e41823baf1a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLAutoProcessTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
from mantid.simpleapi import (mtd, config)
from testhelpers import (assertRaisesNothing, create_algorithm)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
index 34cd61ca6a8..fe62f9001a6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLConvertToQTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
index ee35dd6bb50..0e604ce8596 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPolarizationCorTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
index b25f2fa7844..3649601f938 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLPreprocessTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.simpleapi import ReflectometryILLPreprocess
import numpy.testing
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
index e1611f96baa..a6e4976dfd2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
index cae3ad8bf6c..2ba2e7ef0fb 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import mtd
from testhelpers import (assertRaisesNothing, create_algorithm, illhelpers)
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
index 6a93cf1ecf0..79d257d7543 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import config
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
index b62879a4d17..5f9c4d5b7a3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ResNorm2Test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
index 6a571d7acfa..87713bfb104 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
index 3a23be12413..d730c8be291 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
index 7e4aaf58870..aac43a2b0c2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLIntegrationTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
index 23700e030f1..a3964300251 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import MatrixWorkspace, Run
from mantid.simpleapi import SANSILLReduction, config, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
index 49edeef4e42..bcb6848d86c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSMaskTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import SANSMask, SetInstrumentParameter, MaskDetectors, CreateSampleWorkspace, mtd
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
index c3a37ecd5d4..e3af74e5009 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, MatrixWorkspace
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
index ec6d9ea160e..0553495575a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SavePlot1DTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest, os
from mantid import AnalysisDataServiceImpl, config, simpleapi
try:
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
index 23ec76dc102..4b1138cf44b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import unittest
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
index 7d427b698e7..0e56954e87d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimpleShapeMonteCarloAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import (SimpleShapeMonteCarloAbsorption, Load, ConvertUnits,
CompareWorkspaces, SetSampleMaterial,
DeleteWorkspace)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
index 24f0e382956..a8549d3a5f7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import logger
from mantid.api import ITableWorkspace
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
index 54706645e98..db47c530f9c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import (CompareWorkspaces, CreateSampleWorkspace, Load, LoadInstrument, RenameWorkspace, ScaleX,
SofQW, SofQWMoments)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
index 2ef022800bb..6181fa0863d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
index d04df142373..e7a7b1507f8 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TOSCABankCorrectionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
index 04a406b7e92..293d1f3b298 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
index 23af31f7d27..8d2efb65466 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TotScatCalculateSelfScatteringTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import TotScatCalculateSelfScattering, Load
from isis_powder import SampleDetails
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
index 4b1b92903bb..53c37f775c9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TransformToIqtTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
index 1f9f240d66d..ffcdb38ac74 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/VesuvioDiffractionReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-public-methods,invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
index 735aa2ec17b..9be374252a0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.api import FrameworkManager
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py b/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
index 89ffdd5f068..98d5cdbf1f6 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AFM_LFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py b/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
index 94077cd13c1..f7e658c41c5 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AFM_ZFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
index bf5784336d5..2dab34043b4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
index 27de45812ee..48e0b13b2a4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/BesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py b/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
index 14e4835f19d..db95a1b47c6 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ChudleyElliotTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
index b1671db7a0d..6ff0372f7c8 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/CombGaussLorentzKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py b/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
index ea61f944e5f..c237bf4161a 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/CompositePCRmagnetTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
index d23bb7cbd33..6b78d2e6fa3 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
index 8535ecfa86a..4cda05c2b26 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/DampedBesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
index b6929e36e5d..cd9984a417a 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
from six.moves import zip
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
index 262de3c569c..194c4acb8b7 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereAlkylTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
index 03986189c42..1b196f520ac 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffSphereTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
index 14a7748598e..ba38f2004ad 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
index 65e1eb08faa..91acd5f91f5 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import *
from mantid.api import *
diff --git a/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py b/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
index 719205a4d91..08e4e7eb4b1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/FmuFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
index 85e4daf4e2f..73b6105d636 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/GauBroadGauKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py b/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
index ec53472438f..0bf121b6499 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/GaussBesselTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
index 820d22a23f7..0991cb3f98e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/HighTFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
index 5605e9b2f15..8ca806cdb45 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/LowTFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py b/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
index 2cb2b8785a9..d62ceb69f5c 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MeierTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py b/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
index 0d54f46e08b..d5df125c5c1 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ModOscTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
index f8da7ed228a..d43c279c333 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdGaussTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
index 8115e580174..1b13a9705b4 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdPetersTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py b/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
index 1df748c01b1..450bca6f324 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MsdYiTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py b/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
index 8af4bf30017..6cbc40dd7fa 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MuHTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py b/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
index fa6f95ad6e0..5cb47329e9e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/MuMinusExpTFTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
index 458842e1260..5060ff0a066 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetRedfieldTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
index 4e8eea6d347..7b1522c647d 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
index b925f5fa25c..cb67f49eaa8 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetZFKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
index 91a9f620cb7..b826758d376 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PCRmagnetfnormTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
index 01bcd3335f4..fb0302bfe0f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
diff --git a/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py b/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
index eaf5f700e7d..84af981f7ea 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/RFresonanceTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py b/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
index 52bc64a9ccb..bd62d69edc7 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/RedfieldTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py b/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
index 7b771e4c5cc..fff1f524acc 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/SpinGlassTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py b/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
index 537ee0f8704..580ab7395f8 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StandardSCTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
index d996f040ac9..f134da94feb 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StaticLorentzianKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
index b3e5c687666..eb004b996ad 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
index 991c49ece8a..dcfe97a4ed3 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTestHelper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from scipy import constants
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
index 5cbbb673aa8..ed227f8d6f7 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedKTTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
index e78ad616f88..cad50d02763 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/TFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py b/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
index a26a3f56c56..ed4fabcc316 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/TeixeiraWaterTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
index 74633aeacf7..22e399f6330 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFMuoniumTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
index ffe8d0db6c7..cd190e70fd2 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFdipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
index f6702b67830..783cf238387 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFelectronDipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py b/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
index 6aea67e457b..a53cf428821 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ZFprotonDipoleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import numpy as np
diff --git a/Framework/PythonInterface/test/testhelpers/__init__.py b/Framework/PythonInterface/test/testhelpers/__init__.py
index 395d69af206..9b27fe897b7 100644
--- a/Framework/PythonInterface/test/testhelpers/__init__.py
+++ b/Framework/PythonInterface/test/testhelpers/__init__.py
@@ -7,8 +7,7 @@
"""Defines a set of helpers wrapped around the C++ TestHelpers package that
are for use in unit tests only!
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from distutils.version import LooseVersion
diff --git a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
index 9bb863b56fb..d425e277b24 100644
--- a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
+++ b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import re
diff --git a/Framework/PythonInterface/test/testhelpers/illhelpers.py b/Framework/PythonInterface/test/testhelpers/illhelpers.py
index 307a5a77d2f..f545392bd3d 100644
--- a/Framework/PythonInterface/test/testhelpers/illhelpers.py
+++ b/Framework/PythonInterface/test/testhelpers/illhelpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import mtd
from mantid.kernel import DeltaEModeType, UnitConversion
import numpy
diff --git a/Framework/PythonInterface/test/testhelpers/mlzhelpers.py b/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
index 02a9631f737..b53a551dfad 100644
--- a/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
+++ b/Framework/PythonInterface/test/testhelpers/mlzhelpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import mantid.simpleapi as api
diff --git a/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py b/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
index 9d75d8031c3..424ea5b1e8f 100644
--- a/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
+++ b/Framework/PythonInterface/test/testhelpers/tempfile_wrapper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from tempfile import NamedTemporaryFile
import os
diff --git a/Framework/PythonInterface/test/testhelpers/testrunner.py b/Framework/PythonInterface/test/testhelpers/testrunner.py
index 161558f5ea6..ea7103a5c01 100644
--- a/Framework/PythonInterface/test/testhelpers/testrunner.py
+++ b/Framework/PythonInterface/test/testhelpers/testrunner.py
@@ -11,8 +11,6 @@ once qtpy is universally used.
It is intended to be used as a launcher script for a given unit test file.
The reports are output to the current working directory.
"""
-from __future__ import (absolute_import, division, print_function)
-
import imp
import os
import sys
diff --git a/MantidPlot/ipython_widget/__init__.py b/MantidPlot/ipython_widget/__init__.py
index 1300e7ee5ed..0f46fcd36c1 100644
--- a/MantidPlot/ipython_widget/__init__.py
+++ b/MantidPlot/ipython_widget/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division,
- print_function)
+
from .mantid_ipython_widget import *
diff --git a/MantidPlot/ipython_widget/mantid_ipython_widget.py b/MantidPlot/ipython_widget/mantid_ipython_widget.py
index 2ab0a34db9f..7b7203957e3 100644
--- a/MantidPlot/ipython_widget/mantid_ipython_widget.py
+++ b/MantidPlot/ipython_widget/mantid_ipython_widget.py
@@ -4,8 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division,
- print_function)
+
import sys
import threading
diff --git a/MantidPlot/mantidplot.py b/MantidPlot/mantidplot.py
index a8190546849..835e990dae6 100644
--- a/MantidPlot/mantidplot.py
+++ b/MantidPlot/mantidplot.py
@@ -10,8 +10,7 @@
# Load 'pymantidplot' which cannot be called 'mantidplot' because of
# name conflict with the MantidPlot binary (especially on osx)
#-------------------------------------------------------------------
-from __future__ import (absolute_import, division,
- print_function)
+
import os.path as osp
import sys
diff --git a/MantidPlot/pymantidplot/__init__.py b/MantidPlot/pymantidplot/__init__.py
index c8d9a29887b..ead9c968583 100644
--- a/MantidPlot/pymantidplot/__init__.py
+++ b/MantidPlot/pymantidplot/__init__.py
@@ -8,8 +8,7 @@
MantidPlot module to gain access to plotting functions etc.
Requires that the main script be run from within MantidPlot
"""
-from __future__ import (absolute_import, division,
- print_function)
+
# Requires MantidPlot
try:
import _qti
diff --git a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
index 5fc30c9d8e0..f7a57eb7ce1 100644
--- a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
+++ b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
@@ -13,8 +13,7 @@ mode for MantidPlot is to run all python scripts asynchronously.
Providing this backend allows users to work with the standard matplotlib
API without modification
"""
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
try:
# Newer matplotlib has qt_compat
diff --git a/MantidPlot/pymantidplot/proxies.py b/MantidPlot/pymantidplot/proxies.py
index 617b336c947..3a3143b71cc 100644
--- a/MantidPlot/pymantidplot/proxies.py
+++ b/MantidPlot/pymantidplot/proxies.py
@@ -9,8 +9,7 @@ Module containing classes that act as proxies to the various MantidPlot gui obje
accessible from python. They listen for the QObject 'destroyed' signal and set the wrapped
reference to None, thus ensuring that further attempts at access do not cause a crash.
"""
-from __future__ import (absolute_import, division,
- print_function)
+
from six.moves import range
from PyQt4 import QtCore, QtGui
diff --git a/MantidPlot/pymantidplot/qtiplot.py b/MantidPlot/pymantidplot/qtiplot.py
index 9a3ebdf99be..bb81e658100 100644
--- a/MantidPlot/pymantidplot/qtiplot.py
+++ b/MantidPlot/pymantidplot/qtiplot.py
@@ -11,8 +11,7 @@ qti-based MantidPlot Python plotting interface
As with other MantidPlot modules, this has to run from within MantidPlot
"""
-from __future__ import (absolute_import, division,
- print_function)
+
# Require MantidPlot
try:
diff --git a/MantidPlot/test/MantidPlotInputArgsCheck.py b/MantidPlot/test/MantidPlotInputArgsCheck.py
index c68753298a9..22a3f67994a 100644
--- a/MantidPlot/test/MantidPlotInputArgsCheck.py
+++ b/MantidPlot/test/MantidPlotInputArgsCheck.py
@@ -11,7 +11,6 @@ All these functions should throw a ValueError exception when, for example:
- the specified workspaces don't exist
- the index(es) of spectra, bin or dimension is wrong
"""
-from __future__ import (absolute_import, division, print_function)
import mantidplottests
from mantidplottests import *
import time
diff --git a/MantidPlot/test/mantidplottests.py b/MantidPlot/test/mantidplottests.py
index a9da33b4cdd..cfe3b0ba413 100644
--- a/MantidPlot/test/mantidplottests.py
+++ b/MantidPlot/test/mantidplottests.py
@@ -13,7 +13,6 @@ Public methods:
screenshot(): take a screenshot and save to a report
"""
-from __future__ import (absolute_import, division, print_function)
import sys
import os
import unittest
diff --git a/Testing/PerformanceTests/analysis_mpl.py b/Testing/PerformanceTests/analysis_mpl.py
index d5b8427b1bf..b9716eacb5f 100644
--- a/Testing/PerformanceTests/analysis_mpl.py
+++ b/Testing/PerformanceTests/analysis_mpl.py
@@ -7,8 +7,6 @@
""" Module containing functions for test
performance analysis, plotting, and saving
to other formats (CSV, PDF) """
-from __future__ import (absolute_import, division, print_function)
-
import datetime
import os
diff --git a/Testing/PerformanceTests/sqlresults.py b/Testing/PerformanceTests/sqlresults.py
index bdb6de9750c..37c8996c10f 100644
--- a/Testing/PerformanceTests/sqlresults.py
+++ b/Testing/PerformanceTests/sqlresults.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
try:
import sqlite3
diff --git a/Testing/SystemTests/lib/systemtests/systemtesting.py b/Testing/SystemTests/lib/systemtests/systemtesting.py
index fe2d60a02da..57f9f1d41d3 100644
--- a/Testing/SystemTests/lib/systemtests/systemtesting.py
+++ b/Testing/SystemTests/lib/systemtests/systemtesting.py
@@ -11,8 +11,6 @@ or by importing them into MantidPlot.
File change history is stored at: <https://github.com/mantidproject/systemtests>.
"""
-from __future__ import (absolute_import, division, print_function)
-
# == for testing conda build of mantid-framework ==========
import os
diff --git a/Testing/SystemTests/lib/systemtests/xmlreporter.py b/Testing/SystemTests/lib/systemtests/xmlreporter.py
index bcfe0d98a31..2f1a8a62c9b 100644
--- a/Testing/SystemTests/lib/systemtests/xmlreporter.py
+++ b/Testing/SystemTests/lib/systemtests/xmlreporter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import sys
from xml.dom.minidom import getDOMImplementation
diff --git a/Testing/SystemTests/scripts/InstallerTests.py b/Testing/SystemTests/scripts/InstallerTests.py
index 3f33057f878..b45b97ebcb9 100644
--- a/Testing/SystemTests/scripts/InstallerTests.py
+++ b/Testing/SystemTests/scripts/InstallerTests.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""Finds a package, installs it and runs the tests against it.
"""
import argparse
diff --git a/Testing/SystemTests/scripts/mantidinstaller.py b/Testing/SystemTests/scripts/mantidinstaller.py
index 4b589a0f276..0e59456109b 100644
--- a/Testing/SystemTests/scripts/mantidinstaller.py
+++ b/Testing/SystemTests/scripts/mantidinstaller.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""Defines classes for handling installation
"""
import platform
diff --git a/Testing/SystemTests/scripts/performance/analysis.py b/Testing/SystemTests/scripts/performance/analysis.py
index 2654be90a01..ef585344558 100644
--- a/Testing/SystemTests/scripts/performance/analysis.py
+++ b/Testing/SystemTests/scripts/performance/analysis.py
@@ -7,7 +7,6 @@
""" Module containing functions for test
performance analysis, plotting, and saving
to other formats (CSV, PDF) """
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import testresult
import os
diff --git a/Testing/SystemTests/scripts/performance/sqlresults.py b/Testing/SystemTests/scripts/performance/sqlresults.py
index ed4d530cb3c..8ca422ff12a 100644
--- a/Testing/SystemTests/scripts/performance/sqlresults.py
+++ b/Testing/SystemTests/scripts/performance/sqlresults.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
try:
import sqlite3
diff --git a/Testing/SystemTests/scripts/runSystemTests.py b/Testing/SystemTests/scripts/runSystemTests.py
index 641d723a041..c5574d64283 100755
--- a/Testing/SystemTests/scripts/runSystemTests.py
+++ b/Testing/SystemTests/scripts/runSystemTests.py
@@ -5,8 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import argparse
import os
import sys
diff --git a/Testing/SystemTests/tests/analysis/AbinsTest.py b/Testing/SystemTests/tests/analysis/AbinsTest.py
index 0201954fbf1..25ff1bb6053 100644
--- a/Testing/SystemTests/tests/analysis/AbinsTest.py
+++ b/Testing/SystemTests/tests/analysis/AbinsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import Abins, mtd, DeleteWorkspace
from AbinsModules import AbinsConstants, AbinsTestHelpers
diff --git a/Testing/SystemTests/tests/analysis/BASISTest.py b/Testing/SystemTests/tests/analysis/BASISTest.py
index 5f3fd867b0d..bbb972a2403 100644
--- a/Testing/SystemTests/tests/analysis/BASISTest.py
+++ b/Testing/SystemTests/tests/analysis/BASISTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid import config
from mantid.simpleapi import (BASISCrystalDiffraction, GroupWorkspaces,
diff --git a/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py b/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
index 3c10edae986..4cf3748bec9 100644
--- a/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
+++ b/Testing/SystemTests/tests/analysis/BilbySANSDataProcessorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from BilbyReductionScript import RunBilbyReduction
diff --git a/Testing/SystemTests/tests/analysis/BuildSQWTest.py b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
index 4b041e1d8d4..46c56034e51 100644
--- a/Testing/SystemTests/tests/analysis/BuildSQWTest.py
+++ b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
@@ -13,7 +13,6 @@
the result file that is ~30Gb. The files are not included with the standard
repository & required to be accessible from any machine that wishes to run the test.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py b/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
index dab0cd18699..6fbc2de3573 100644
--- a/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
+++ b/Testing/SystemTests/tests/analysis/CRISPLoadingTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from LoadAndCheckBase import *
diff --git a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index 0d81439462b..76ed1acba01 100644
--- a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/CodeConventions.py b/Testing/SystemTests/tests/analysis/CodeConventions.py
index a9bd3f22393..872a5b12d0c 100644
--- a/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import re
import mantid
diff --git a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
index c8885d6b5b3..1d01967678e 100644
--- a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
+++ b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
index 6d1ed6b7ca7..034d61ef831 100644
--- a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from SortHKLTest import HKLStatisticsTestMixin
diff --git a/Testing/SystemTests/tests/analysis/DOSTest.py b/Testing/SystemTests/tests/analysis/DOSTest.py
index 5534dbfc9c3..65c9cfe91c2 100644
--- a/Testing/SystemTests/tests/analysis/DOSTest.py
+++ b/Testing/SystemTests/tests/analysis/DOSTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import *
from mantid.api import *
diff --git a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
index bf399cb583a..610748049bd 100644
--- a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
+++ b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
@@ -9,7 +9,6 @@
System test that loads TOPAZ single-crystal data,
and runs Diffraction Workflow.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy
import os
diff --git a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
index bf569483a67..053b76edaac 100644
--- a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
+++ b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name,no-init
import os
from systemtesting import MantidSystemTest
diff --git a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
index 928e9661873..ce506f92916 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import math
import os
diff --git a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
index c6477b2dc74..1502d840006 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
diff --git a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
index 078ded2ee25..02ab8e33ec4 100644
--- a/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
+++ b/Testing/SystemTests/tests/analysis/EnginXScriptTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import shutil
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
index 53954c27557..d3dff75930a 100644
--- a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
+++ b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
import os
import re
diff --git a/Testing/SystemTests/tests/analysis/GUIStartupTest.py b/Testing/SystemTests/tests/analysis/GUIStartupTest.py
index 73efbf4fef2..edacdbea8a0 100644
--- a/Testing/SystemTests/tests/analysis/GUIStartupTest.py
+++ b/Testing/SystemTests/tests/analysis/GUIStartupTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import platform
import subprocess
diff --git a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
index f20d6fe3bfd..6ecc3080b6a 100644
--- a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
@@ -13,7 +13,6 @@
The following tests were converted from the unittest framework
that is part of python to the systemtesting framework used in Mantid.
"""
-from __future__ import (absolute_import, division, print_function)
import types
import traceback
diff --git a/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py b/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
index fe96ca2f448..a937ef3c980 100644
--- a/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLDetectorEfficiencyCorUserTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy
import systemtesting
from mantid.simpleapi import (ConvertUnits, DetectorEfficiencyCorUser, DirectILLCollectData)
diff --git a/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py b/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
index d4462d82145..dba4f6a6d5b 100644
--- a/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLDirectGeometryReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid import mtd
from mantid.simpleapi import (config, CropWorkspace, DeleteWorkspace, DirectILLApplySelfShielding, DirectILLCollectData,
DirectILLDiagnostics, DirectILLIntegrateVanadium, DirectILLReduction, DirectILLSelfShielding,
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py b/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
index 07f9f82ca70..17133ebbe37 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderD2BEfficiencyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLEfficiency, GroupWorkspaces
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
index 6862da7fc68..46f51f9e22f 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDetectorScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
index e73e60c4ca1..c38e5b167ae 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyClosureTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from tempfile import gettempdir
from os import path, remove
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
index efab9cef6ae..a1edd2e7e4f 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderEfficiencyTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLEfficiency, GroupWorkspaces
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py b/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
index a98317f161e..6a07aadf012 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderParameterScanTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import PowderILLParameterScan
from mantid import config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py b/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
index 9b71506c5e1..bfa2dfe0860 100644
--- a/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLReflAutoProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import ReflectometryILLAutoProcess, config, mtd
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index 4a20e2f4295..aad4080c473 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.api import Workspace
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
index 7c94af5a1dd..fc92255b4ad 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
index 1ad59163af6..31ec170f5a4 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init, too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
import warnings
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index 090c193822e..ea2a0659460 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -73,7 +73,6 @@ systemtesting.MantidSystemTest
|
'''
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
index 370e2abd3cd..90cdf90ea29 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
index 28ffe767b13..348892de97a 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index 6f4cd225177..c56feb54e44 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import math
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index 6331a0ea999..247e6592b9d 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index e6cf6363741..7e2fd4d53b4 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -9,7 +9,6 @@
These system tests are to verify that the IDF and parameter files for POLREF, CRISP, INTER and SURF are read properly
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import os
diff --git a/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py b/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
index ecf74335184..bbbff8a0470 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflectometryWorkflowBase.py
@@ -8,7 +8,6 @@
System Test for ISIS Reflectometry reduction
Adapted from scripts provided by Max Skoda.
"""
-from __future__ import (print_function)
from mantid.simpleapi import *
from mantid import ConfigService
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
index a5202313cb8..df6792bcba0 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import systemtesting
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
index ced0d1ff131..8b5e3a854b1 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import platform
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
index 42d64ef90d0..72ca3f6abce 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import systemtesting
import shutil
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 4dc45f8bf01..e0e9911071b 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index 8165d9f397d..e0727f22b2c 100644
--- a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,non-parent-init-called,too-few-public-methods
# non-parent-init-called is disabled to remove false positives from a bug in pyLint < 1.4
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py b/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
index 397f77f285e..7508455ed51 100644
--- a/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
+++ b/Testing/SystemTests/tests/analysis/IndirectQuickRunTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import (AnalysisDataService, WorkspaceGroup)
from mantid.simpleapi import (CompareWorkspaces, IndirectQuickRun, LoadNexus)
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py b/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
index 2107e4d37b3..2a5f88159d5 100644
--- a/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
+++ b/Testing/SystemTests/tests/analysis/LinkedUBs_Test.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init
# System test that loads short SXD numors and runs LinkedUBs.
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 6efd57d980f..24d26f6b066 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -9,7 +9,6 @@
These system tests are to verify the behaviour of the ISIS reflectometry reduction scripts
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import mantid.api
diff --git a/Testing/SystemTests/tests/analysis/LoadExedTest.py b/Testing/SystemTests/tests/analysis/LoadExedTest.py
index 530289c0ced..7a7c7f2dd54 100644
--- a/Testing/SystemTests/tests/analysis/LoadExedTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadExedTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as ms
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
index 52be91c318e..2cd7f558782 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import config, Load
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
index d58fa443b22..681691016dd 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
index f03b9634a9d..efec2c29a3c 100644
--- a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import FileFinder, MatrixWorkspace, mtd
diff --git a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
index bdff0a744c9..566534b14da 100644
--- a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
+++ b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
@@ -10,7 +10,6 @@ Test some features of MDWorkspaces, such as
file-backed MDWorkspaces.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
index 681a1dd4bb6..9d0a9f547d1 100644
--- a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
index 9f0b190f65f..ab6460a003c 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
index 150b55b0447..46848656945 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
index 45b53914550..1b4aac129cc 100644
--- a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
+++ b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
@@ -15,7 +15,6 @@
# import systemtesting
-from __future__ import (absolute_import, division, print_function)
import numpy
from numpy import matrix
import math
diff --git a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
index 0dc68818332..401081ae39b 100644
--- a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
+++ b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
@@ -14,7 +14,6 @@
# for powder diffractometers.
#
########################################################################
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as api
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
index 4b33526eb53..976417f4489 100644
--- a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
+++ b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
@@ -8,7 +8,6 @@
"""
Extract or compute the Q values from reduced QENS data
"""
-from __future__ import (absolute_import, division, print_function)
from systemtesting import MantidSystemTest
import mantid
import mantid.simpleapi as sm
diff --git a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index 11135c5e5fb..2f69e364c88 100644
--- a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -19,7 +19,6 @@
#information.
#
#
-from __future__ import (absolute_import, division, print_function)
import time
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 993f502e81a..6926bc68527 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -9,7 +9,6 @@
These system tests are to verify the behaviour of the ISIS reflectometry reduction scripts
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
index 0ba0842ed1c..fcca174b061 100644
--- a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
+++ b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
@@ -9,7 +9,6 @@
Verifies that a calibration file can be loaded once and reused to apply, using CopyInstrumentParameters, the same calibration
in successive reductions.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatch.py b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
index 95c02eb57ab..d04a0ad8e72 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
index 3a9e2230565..d7ebb0e83c1 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid import config
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
index bb78811248b..a104bf37cd7 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
index 9a645e4cf00..99120e0ba26 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, SetDetectorOffsets, Gravity, Set1D,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
index 270d6648e1d..ad9810975e9 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
index 547acfe505c..39966a7c049 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
index 53328e62be3..6e1dfc64d4b 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, AssignSample, WavRangeReduction,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
index 6c2fd280a4f..71adc93e5e7 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
@@ -7,7 +7,6 @@
#pylint: disable=no-init,too-few-public-methods
# test batch mode with sans2d and selecting a period in batch mode
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import AnalysisDataService
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
index dada802fb19..ec95710827d 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
index 0d2879054c0..dc913e1b5c3 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.kernel import config
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
index 0d83c73d628..9f7853cf03a 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
index 63dc3e11feb..f10c1d276b7 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
@@ -19,7 +19,6 @@ The first 2 Tests ensures that the result provided by the GUI are the same for t
Test was first created to apply to Mantid Release 3.0.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import isis_reducer
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
index db1f889e3eb..7d9ab610109 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAdded.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
import ISISCommandInterface as i
import copy
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
index ff156556367..3cc7930caa8 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
@@ -10,7 +10,6 @@
One test has been removed from the port since it uses the ReductionSingleton.
"""
-from __future__ import (absolute_import, division, print_function)
import mantid # noqa
import systemtesting
import os
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
index 7d4233374ef..138bec176a4 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
@@ -10,7 +10,6 @@ The tests here are ports from the original SANS2DReductionGUI.py test suite. Not
include details about the ReductionSingleton
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import (config)
from mantid.api import (FileFinder)
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py b/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
index f6a2c995799..042f21accd8 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSearchCentreGUI.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid # noqa
import ISISCommandInterface as i
import isis_reducer
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
index 31003fa3e89..77f2556bc9a 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
index 691487e97eb..1fc9534c8f3 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.api import (AnalysisDataService, FileFinder)
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, BatchReduce, SetEventSlices,
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
index 426cf71f621..47b4fea5bbe 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
index 27f2bb0525c..da0377ce093 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, Gravity, Set1D, AssignSample,
diff --git a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
index 9e4a98f4528..2c6ee286af3 100644
--- a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
index 6aba9a0c48f..384b386f1da 100644
--- a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSCentreSample.py b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
index bf6cbca41ee..8155f2b6cfc 100644
--- a/Testing/SystemTests/tests/analysis/SANSCentreSample.py
+++ b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
index e66a5cc48ab..7de71954ea3 100644
--- a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
@@ -8,7 +8,6 @@
#pylint: disable=invalid-name
#pylint: disable=too-many-arguments
#pylint: disable=too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
index 17b37bd2ca5..f17d4626eef 100644
--- a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSFileChecking.py b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
index e9953522b2c..40c2f747528 100644
--- a/Testing/SystemTests/tests/analysis/SANSFileChecking.py
+++ b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
@@ -10,7 +10,6 @@
Check that file manipulation works fine
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py b/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
index 0690c398920..99c4674ef07 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLAbsoluteScaleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py b/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
index 0e6d54b9abf..5d3eec88f50 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLAutoProcessTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import SANSILLAutoProcess, config, mtd, GroupWorkspaces, SaveNexusProcessed
import os
diff --git a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
index bea24b0aac0..d8ec0a1a3af 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py b/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
index a80df8d4d62..1a2aafbdd5c 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQAddBatch.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.api import FileFinder
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
index 17c23c1785f..fb94c339b2e 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid import config
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
index e0334f1e94c..625c09f70aa 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os.path
from mantid.kernel import config
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
index 5b973697892..b6ffdbec944 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
index d9c6ad67bb4..09ab942c067 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set2D, Detector, MaskFile, SetDetectorOffsets, Gravity,
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py b/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
index 36ce185baa5..bc16d6a5305 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCentreNoGrav.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
index 0c6b834ddcf..645ee2fab34 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUI.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import ISISCommandInterface as i
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
index 4ee325c93ac..fb42b89d2fc 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQReductionGUITest_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.kernel import config
from mantid.api import FileFinder
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py b/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
index b2e9670faeb..0fe7bc76350 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQTransFitWorkspace2D.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py b/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
index 7e259d2bf35..7a604ede90e 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOWCentreNoGrav_V2.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set1D, Detector, MaskFile, Gravity, AssignSample,
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadTest.py b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
index 241b3111563..364a9931b84 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
index 2164482b6cd..db4fb67b71e 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
@@ -11,7 +11,6 @@ take considerable time because it involves loading data. Besides, it uses data t
currently available inside the systemtests.
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
index 93c86a7f091..85824435945 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import DeleteWorkspace, mtd
import ISISCommandInterface as i
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
index 7576e67bbfa..1a401188abc 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import DeleteWorkspace, mtd
from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, MaskFile, SetDetectorOffsets, Gravity, Set1D,
diff --git a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
index 46545236779..9eb1adeab13 100644
--- a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
diff --git a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
index 6d76e23a0cd..38d44e52b91 100644
--- a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSSaveTest.py b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
index 20e0947e7fb..f2d666dfc79 100644
--- a/Testing/SystemTests/tests/analysis/SANSSaveTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import os
import mantid
import unittest
diff --git a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
index fdf418b6bec..3edd09c7a29 100644
--- a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import systemtesting
diff --git a/Testing/SystemTests/tests/analysis/SANSUtilityTest.py b/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
index fd733cb52f8..13eae87db49 100644
--- a/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSUtilityTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import SANSUtility as su
diff --git a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
index 7d9088f995f..b3ccc89fde2 100644
--- a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from SANSUtility import can_load_as_event_workspace
diff --git a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
index 836843de733..224a3e6fa21 100644
--- a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
+++ b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
@@ -9,7 +9,6 @@
Test the SNS inelatic reduction scripts.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
import shutil
diff --git a/Testing/SystemTests/tests/analysis/SNAPRedux.py b/Testing/SystemTests/tests/analysis/SNAPRedux.py
index 5388dcdd86a..15194cde1bc 100644
--- a/Testing/SystemTests/tests/analysis/SNAPRedux.py
+++ b/Testing/SystemTests/tests/analysis/SNAPRedux.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
import os
diff --git a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
index 9b1f1591c9a..db8393c2aca 100644
--- a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
+++ b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SXDAnalysis.py b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
index 7f838c5cddb..85f622fbd5a 100644
--- a/Testing/SystemTests/tests/analysis/SXDAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SaveNexusTest.py b/Testing/SystemTests/tests/analysis/SaveNexusTest.py
index 7fafd4e1122..0aeb9e5f23b 100644
--- a/Testing/SystemTests/tests/analysis/SaveNexusTest.py
+++ b/Testing/SystemTests/tests/analysis/SaveNexusTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
diff --git a/Testing/SystemTests/tests/analysis/SortHKLTest.py b/Testing/SystemTests/tests/analysis/SortHKLTest.py
index 8397ed79742..a52e77b59e4 100644
--- a/Testing/SystemTests/tests/analysis/SortHKLTest.py
+++ b/Testing/SystemTests/tests/analysis/SortHKLTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import json
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
index 428ca565e80..6c9659df155 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import re
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
index 2027daf0f38..013bb9f92ec 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.simpleapi import *
from mantid.geometry import *
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
index 6e425ef8391..9d0b97d42c1 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
-from __future__ import (absolute_import, division, print_function)
import systemtesting
from mantid.geometry import *
from six import iteritems
diff --git a/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 50fbcdfc65b..557e3067add 100644
--- a/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -10,7 +10,6 @@ Some of the sphinx warnings come from the C++ code, from the properties of the a
This test tries to detect the most common such errors.
It also detects if a new category is created (i.e. someone uses Utilities instead of Utility)
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid
import re
diff --git a/Testing/SystemTests/tests/analysis/SurfLoadingTest.py b/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
index 1871838f2ad..2ee43fd4b90 100644
--- a/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
+++ b/Testing/SystemTests/tests/analysis/SurfLoadingTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from LoadAndCheckBase import *
diff --git a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
index 7300e8ee4f1..55e6b9354bf 100644
--- a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
+++ b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
@@ -10,7 +10,6 @@ System test that loads TOPAZ single-crystal data,
converts to Q space, finds peaks and indexes
them.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
index 6472bc1d7f6..e517ea596a6 100644
--- a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
+++ b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
-
import glob
import os
diff --git a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
index ca13d12c374..82ad8883c8a 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
@@ -12,7 +12,6 @@ Unit test for Vesuvio corrections steps
Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import numpy as np
diff --git a/Testing/SystemTests/tests/analysis/WishCalibrate.py b/Testing/SystemTests/tests/analysis/WishCalibrate.py
index 133c9410c08..fed2bb4a1b3 100644
--- a/Testing/SystemTests/tests/analysis/WishCalibrate.py
+++ b/Testing/SystemTests/tests/analysis/WishCalibrate.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import filecmp
import numpy as np
import os
diff --git a/Testing/SystemTests/tests/analysis/WishMasking.py b/Testing/SystemTests/tests/analysis/WishMasking.py
index e583061c074..f093a43696d 100644
--- a/Testing/SystemTests/tests/analysis/WishMasking.py
+++ b/Testing/SystemTests/tests/analysis/WishMasking.py
@@ -10,7 +10,6 @@ Tests masking functionality specific to WISH. Working masking behaviour is criti
- Email Pascal Manuel @ ISIS if things break here and let him know how his scripts may need to be modified.
"""
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import os
from mantid.simpleapi import *
diff --git a/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py b/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
index b8444723c99..94d14f140f1 100644
--- a/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
+++ b/Testing/SystemTests/tests/analysis/complexShapeAbsorptionsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import systemtesting
import mantid.simpleapi as mantid
from mantid import config
diff --git a/buildconfig/class_maker.py b/buildconfig/class_maker.py
index d50942b00c2..13f1a099a7b 100755
--- a/buildconfig/class_maker.py
+++ b/buildconfig/class_maker.py
@@ -6,8 +6,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for generating a class file, header, and test file """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import sys
import os
diff --git a/buildconfig/cmakelists_utils.py b/buildconfig/cmakelists_utils.py
index 248f40ccb6a..0088b6d52e4 100644
--- a/buildconfig/cmakelists_utils.py
+++ b/buildconfig/cmakelists_utils.py
@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import os
import re
diff --git a/buildconfig/delete_class.py b/buildconfig/delete_class.py
index 69f8c3b5a9c..8f066b6a330 100755
--- a/buildconfig/delete_class.py
+++ b/buildconfig/delete_class.py
@@ -6,8 +6,6 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for deleting a class file """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import datetime
import os
diff --git a/buildconfig/move_class.py b/buildconfig/move_class.py
index 5e6a1dea2e8..9e415cacdce 100755
--- a/buildconfig/move_class.py
+++ b/buildconfig/move_class.py
@@ -6,8 +6,6 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
""" Utility for moving a class file to a different project."""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import datetime
import os
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
index 05f56278ef9..7ef2659a0b2 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/main.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import sys
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
index ebd68d66728..c260b8dcf76 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import presenter
import plot_presenter
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
index 06531ea4855..a5b731d55e4 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/master_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import view
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
index 4632a5563d7..fe2c343ad16 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
def line_colours():
colour_table = ["red", "blue", "black"]
return colour_table
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
index 995e99af40e..b0c5abfb339 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_data.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
index 15b621fc6b8..1c921b3d04b 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class PlotPresenter(object):
def __init__(self, view):
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
index c4d1c9aa031..2c41e8bb992 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import matplotlib.pyplot as plt
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
index 02360230e3a..a42e14c3196 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class Presenter(object):
def __init__(self, view, colours):
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
index 3f650cde0f2..0f1aa66b9c0 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index f118d5c1117..4ea14816349 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import os
import re
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 9842d126cee..1273923d55a 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/docs/sphinxext/mantiddoc/directives/categories.py
@@ -12,7 +12,6 @@
creates "index" pages that lists the contents of each category. The display of each
"index" page is controlled by a jinja2 template.
"""
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective, algorithm_name_and_version #pylint: disable=unused-import
from sphinx.util.osutil import relative_uri
import os
diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py
index cd410e7da10..4328e2801ab 100644
--- a/docs/sphinxext/mantiddoc/directives/diagram.py
+++ b/docs/sphinxext/mantiddoc/directives/diagram.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import BaseDirective #pylint: disable=unused-import
from sphinx.locale import _ #pylint: disable=unused-import
import os
diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py
index cc027352d11..7abde84b9f3 100644
--- a/docs/sphinxext/mantiddoc/directives/properties.py
+++ b/docs/sphinxext/mantiddoc/directives/properties.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,deprecated-module
-from __future__ import (absolute_import, division, print_function)
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import re
from string import punctuation
diff --git a/docs/sphinxext/mantiddoc/directives/sourcelink.py b/docs/sphinxext/mantiddoc/directives/sourcelink.py
index 1baf5c6d695..9332153beeb 100644
--- a/docs/sphinxext/mantiddoc/directives/sourcelink.py
+++ b/docs/sphinxext/mantiddoc/directives/sourcelink.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import subprocess
from six import iteritems
diff --git a/qt/applications/workbench/workbench/app/mainwindow.py b/qt/applications/workbench/workbench/app/mainwindow.py
index a9488f0aa0d..5ee63b31454 100644
--- a/qt/applications/workbench/workbench/app/mainwindow.py
+++ b/qt/applications/workbench/workbench/app/mainwindow.py
@@ -10,8 +10,6 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import argparse
import atexit
import importlib
diff --git a/qt/applications/workbench/workbench/config/__init__.py b/qt/applications/workbench/workbench/config/__init__.py
index b5128ff08f2..9dfdac28ee5 100644
--- a/qt/applications/workbench/workbench/config/__init__.py
+++ b/qt/applications/workbench/workbench/config/__init__.py
@@ -16,8 +16,6 @@ should import the CONF object as
and use it to access the settings
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
from collections import namedtuple
import os
diff --git a/qt/applications/workbench/workbench/config/fonts.py b/qt/applications/workbench/workbench/config/fonts.py
index 785a1eb6f0d..e714b2047df 100644
--- a/qt/applications/workbench/workbench/config/fonts.py
+++ b/qt/applications/workbench/workbench/config/fonts.py
@@ -9,8 +9,6 @@
#
""" Utility functions to deal with fetching fonts
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import os
import os.path as osp
diff --git a/qt/applications/workbench/workbench/config/user.py b/qt/applications/workbench/workbench/config/user.py
index f38d73d8d9e..fb951e22ba6 100644
--- a/qt/applications/workbench/workbench/config/user.py
+++ b/qt/applications/workbench/workbench/config/user.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
from mantid.py3compat import is_text_string
from posixpath import join as joinsettings
diff --git a/qt/applications/workbench/workbench/plotting/backend_workbench.py b/qt/applications/workbench/workbench/plotting/backend_workbench.py
index 7193035b7a4..ce0c24fe39e 100644
--- a/qt/applications/workbench/workbench/plotting/backend_workbench.py
+++ b/qt/applications/workbench/workbench/plotting/backend_workbench.py
@@ -13,8 +13,7 @@ Qt-based matplotlib backend that can operate when called from non-gui threads.
It uses qtagg for rendering but the ensures that any rendering calls
are done on the main thread of the application as the default
"""
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# std imports
import importlib
diff --git a/qt/applications/workbench/workbench/plotting/config.py b/qt/applications/workbench/workbench/plotting/config.py
index 5b9733fceab..87da32bd242 100644
--- a/qt/applications/workbench/workbench/plotting/config.py
+++ b/qt/applications/workbench/workbench/plotting/config.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
# 3rd-party imports
diff --git a/qt/applications/workbench/workbench/plotting/figureinteraction.py b/qt/applications/workbench/workbench/plotting/figureinteraction.py
index a23811d34f0..d0bafde9cc2 100644
--- a/qt/applications/workbench/workbench/plotting/figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/figureinteraction.py
@@ -9,8 +9,6 @@
"""
Defines interaction behaviour for plotting.
"""
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
from collections import OrderedDict
from copy import copy
diff --git a/qt/applications/workbench/workbench/plotting/figuremanager.py b/qt/applications/workbench/workbench/plotting/figuremanager.py
index 7201eade9b7..44a8ce851ee 100644
--- a/qt/applications/workbench/workbench/plotting/figuremanager.py
+++ b/qt/applications/workbench/workbench/plotting/figuremanager.py
@@ -8,8 +8,6 @@
#
#
"""Provides our custom figure manager to wrap the canvas, window and our custom toolbar"""
-from __future__ import (absolute_import, unicode_literals)
-
import sys
from functools import wraps
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
index 7e74ab9d985..ab55a883fd4 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.mantidaxes import MantidAxes
from mantidqt.widgets.plotconfigdialog import curve_in_ax
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
index 3032199f3e1..54cd3158ac7 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/axes.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from numpy import isclose
from mantid.plots.utility import get_autoscale_limits
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
index ed257509c1b..56c506aa535 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/figure.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from numpy import isclose
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
index e218c4e0350..553b4e50256 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/lines.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from matplotlib.container import ErrorbarContainer
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
index 4f84bbd2826..f40b1832920 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
import matplotlib as mpl
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
index 2a6cef17e95..935f73c23cb 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import re
import numpy as np
diff --git a/qt/applications/workbench/workbench/plotting/propertiesdialog.py b/qt/applications/workbench/workbench/plotting/propertiesdialog.py
index f814e7f8796..ba10e60d7be 100644
--- a/qt/applications/workbench/workbench/plotting/propertiesdialog.py
+++ b/qt/applications/workbench/workbench/plotting/propertiesdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
# 3rdparty imports
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
index b6b9e9cd0b1..c72203b3dd3 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
@@ -6,8 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
index 3c54cd45f94..5879ba13855 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
@@ -6,8 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# system imports
import unittest
diff --git a/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py b/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
index a7b9545e066..cf3275899d7 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_propertiesdialog.py
@@ -6,8 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
# system imports
import unittest
diff --git a/qt/applications/workbench/workbench/plotting/toolbar.py b/qt/applications/workbench/workbench/plotting/toolbar.py
index 34e050eba70..e1073d65100 100644
--- a/qt/applications/workbench/workbench/plotting/toolbar.py
+++ b/qt/applications/workbench/workbench/plotting/toolbar.py
@@ -8,8 +8,6 @@
#
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from matplotlib.backends.backend_qt5 import NavigationToolbar2QT
from qtpy import QtCore, QtGui, QtPrintSupport, QtWidgets
diff --git a/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py b/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
index 58972040250..7814524100a 100644
--- a/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
+++ b/qt/applications/workbench/workbench/plugins/algorithmselectorwidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from contextlib import contextmanager
from qtpy.QtWidgets import QVBoxLayout
diff --git a/qt/applications/workbench/workbench/plugins/editor.py b/qt/applications/workbench/workbench/plugins/editor.py
index f34125a26c9..8daf4773bb6 100644
--- a/qt/applications/workbench/workbench/plugins/editor.py
+++ b/qt/applications/workbench/workbench/plugins/editor.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import os.path as osp
diff --git a/qt/applications/workbench/workbench/plugins/jupyterconsole.py b/qt/applications/workbench/workbench/plugins/jupyterconsole.py
index 10737d2c9f0..5f8f599f011 100644
--- a/qt/applications/workbench/workbench/plugins/jupyterconsole.py
+++ b/qt/applications/workbench/workbench/plugins/jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import warnings
warnings.filterwarnings(action='ignore',
diff --git a/qt/applications/workbench/workbench/plugins/logmessagedisplay.py b/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
index c9e431a22e5..24bd3230f37 100644
--- a/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
+++ b/qt/applications/workbench/workbench/plugins/logmessagedisplay.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import sys
from qtpy.QtWidgets import QHBoxLayout
diff --git a/qt/applications/workbench/workbench/plugins/plotselectorwidget.py b/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
index 81618bca733..9aafffff636 100644
--- a/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
+++ b/qt/applications/workbench/workbench/plugins/plotselectorwidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
# third-party library imports
diff --git a/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py b/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
index 3b267279d77..c5575730891 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
import unittest
diff --git a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
index 12ac4b7b71c..3d38d8daa0d 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division)
-
import unittest
import matplotlib as mpl
diff --git a/qt/applications/workbench/workbench/plugins/workspacewidget.py b/qt/applications/workbench/workbench/plugins/workspacewidget.py
index b3af9a0989b..27e8459a8b4 100644
--- a/qt/applications/workbench/workbench/plugins/workspacewidget.py
+++ b/qt/applications/workbench/workbench/plugins/workspacewidget.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from functools import partial
from qtpy.QtWidgets import QApplication, QMessageBox, QVBoxLayout
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py b/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
index 3bd71ff6e5b..f6414aa370b 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import socket
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py b/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
index 6ffa0a9ca44..a11b152d4fb 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecoveryloader.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
from qtpy.QtWidgets import QApplication
diff --git a/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py b/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
index 40bfa90c672..6d449d63fdb 100644
--- a/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
+++ b/qt/applications/workbench/workbench/projectrecovery/projectrecoverysaver.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import datetime
import os
from threading import Timer
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
index 0d4b442363c..0700fca7bb5 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import six
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
index 87190845e09..07b413bfe86 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverypresenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from workbench.projectrecovery.recoverygui.projectrecoverymodel import ProjectRecoveryModel
from workbench.projectrecovery.recoverygui.projectrecoverywidgetview import ProjectRecoveryWidgetView
from workbench.projectrecovery.recoverygui.recoveryfailureview import RecoveryFailureView
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
index 1d80cbdd9a2..db0dffdb220 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverywidgetview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Signal, Slot, Qt
from qtpy.QtWidgets import QDialog, QHeaderView, QTableWidgetItem
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
index ea28b892ffe..0d7a670e4e2 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/recoveryfailureview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Signal, Slot, Qt
from qtpy.QtWidgets import QDialog, QHeaderView, QTableWidgetItem
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
index 1fa778efbdc..04276a3e7b1 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import time
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
index 9ac771a46cc..92bbb33ff4f 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
index fa6aee88220..c5dfa29dc71 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
index c9601cbe8f2..c4ac4778256 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from qtpy.QtWidgets import QTableWidgetItem
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
index 88d5e895516..06f81050991 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import socket
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
index 6ad9ca74a3c..19d69dacd5d 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import os
import shutil
import sys
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
index 50dd04418d7..6621e7891c2 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
import json
import os
import shutil
diff --git a/qt/applications/workbench/workbench/test/mainwindowtest.py b/qt/applications/workbench/workbench/test/mainwindowtest.py
index 3c2cd0b2a36..ba6727b4882 100644
--- a/qt/applications/workbench/workbench/test/mainwindowtest.py
+++ b/qt/applications/workbench/workbench/test/mainwindowtest.py
@@ -10,8 +10,6 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantid.py3compat.mock import patch
diff --git a/qt/applications/workbench/workbench/test/test_import.py b/qt/applications/workbench/workbench/test/test_import.py
index ee6db74c54a..2ebd5ef463a 100644
--- a/qt/applications/workbench/workbench/test/test_import.py
+++ b/qt/applications/workbench/workbench/test/test_import.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/applications/workbench/workbench/utils/test/windowfindertest.py b/qt/applications/workbench/workbench/utils/test/windowfindertest.py
index f9ac6f7b926..8cc1a5e005a 100644
--- a/qt/applications/workbench/workbench/utils/test/windowfindertest.py
+++ b/qt/applications/workbench/workbench/utils/test/windowfindertest.py
@@ -10,8 +10,6 @@
"""
Defines the QMainWindow of the application and the main() entry point.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from workbench.app.mainwindow import MainWindow
diff --git a/qt/applications/workbench/workbench/utils/windowfinder.py b/qt/applications/workbench/workbench/utils/windowfinder.py
index cd60ad7a56b..eb40b707bef 100644
--- a/qt/applications/workbench/workbench/utils/windowfinder.py
+++ b/qt/applications/workbench/workbench/utils/windowfinder.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from qtpy.QtWidgets import QApplication
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/applications/workbench/workbench/widgets/settings/presenter.py b/qt/applications/workbench/workbench/widgets/settings/presenter.py
index 9d0ca533199..ef12d81f791 100644
--- a/qt/applications/workbench/workbench/widgets/settings/presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from mantid import ConfigService
diff --git a/qt/python/mantidqt/MPLwidgets.py b/qt/python/mantidqt/MPLwidgets.py
index f28eb9bdabe..cf1435a6430 100644
--- a/qt/python/mantidqt/MPLwidgets.py
+++ b/qt/python/mantidqt/MPLwidgets.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .gui_helper import set_matplotlib_backend
backend = set_matplotlib_backend() # must be at the top of this file
diff --git a/qt/python/mantidqt/algorithminputhistory.py b/qt/python/mantidqt/algorithminputhistory.py
index c95a5f67a41..4132de0cdc1 100644
--- a/qt/python/mantidqt/algorithminputhistory.py
+++ b/qt/python/mantidqt/algorithminputhistory.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt, toQSettings
diff --git a/qt/python/mantidqt/dialogs/algorithmdialog.py b/qt/python/mantidqt/dialogs/algorithmdialog.py
index 42f9d3a2812..533efdaa6f6 100644
--- a/qt/python/mantidqt/dialogs/algorithmdialog.py
+++ b/qt/python/mantidqt/dialogs/algorithmdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/dialogs/genericdialog.py b/qt/python/mantidqt/dialogs/genericdialog.py
index 94d24f2e31c..1e29fadc9a1 100644
--- a/qt/python/mantidqt/dialogs/genericdialog.py
+++ b/qt/python/mantidqt/dialogs/genericdialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/dialogs/spectraselectordialog.py b/qt/python/mantidqt/dialogs/spectraselectordialog.py
index 0612be98211..62e4b1e526a 100644
--- a/qt/python/mantidqt/dialogs/spectraselectordialog.py
+++ b/qt/python/mantidqt/dialogs/spectraselectordialog.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialogButtonBox, QMessageBox
diff --git a/qt/python/mantidqt/dialogs/test/__init__.py b/qt/python/mantidqt/dialogs/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/dialogs/test/__init__.py
+++ b/qt/python/mantidqt/dialogs/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/gui_helper.py b/qt/python/mantidqt/gui_helper.py
index 8c5c79c8826..fbca12f7572 100644
--- a/qt/python/mantidqt/gui_helper.py
+++ b/qt/python/mantidqt/gui_helper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QApplication) # noqa
from qtpy import QtCore, QtGui
import matplotlib
diff --git a/qt/python/mantidqt/hint.py b/qt/python/mantidqt/hint.py
index c9a518338a6..cfbe8fc4a67 100644
--- a/qt/python/mantidqt/hint.py
+++ b/qt/python/mantidqt/hint.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
Hint = import_qt('._common', 'mantidqt', 'Hint')
diff --git a/qt/python/mantidqt/icons/__init__.py b/qt/python/mantidqt/icons/__init__.py
index 2c651b80a4f..963438d8cf7 100644
--- a/qt/python/mantidqt/icons/__init__.py
+++ b/qt/python/mantidqt/icons/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
get_icon = import_qt('._icons', 'mantidqt.icons', 'getIcon')
diff --git a/qt/python/mantidqt/icons/test/test_icons.py b/qt/python/mantidqt/icons/test/test_icons.py
index aea93d1a5b9..b6317343dd7 100644
--- a/qt/python/mantidqt/icons/test/test_icons.py
+++ b/qt/python/mantidqt/icons/test/test_icons.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.icons import get_icon
diff --git a/qt/python/mantidqt/interfacemanager.py b/qt/python/mantidqt/interfacemanager.py
index 199cb4f8c90..12392056912 100644
--- a/qt/python/mantidqt/interfacemanager.py
+++ b/qt/python/mantidqt/interfacemanager.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/project/basedecoder.py b/qt/python/mantidqt/project/basedecoder.py
index e5da77ba147..0f13d26817d 100644
--- a/qt/python/mantidqt/project/basedecoder.py
+++ b/qt/python/mantidqt/project/basedecoder.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.utils.qt import import_qt
BaseDecoder = import_qt('._common', 'mantidqt', 'BaseDecoder')
diff --git a/qt/python/mantidqt/project/baseencoder.py b/qt/python/mantidqt/project/baseencoder.py
index ba1426a0d59..fa61ae73886 100644
--- a/qt/python/mantidqt/project/baseencoder.py
+++ b/qt/python/mantidqt/project/baseencoder.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.utils.qt import import_qt
BaseEncoder = import_qt('._common', 'mantidqt', 'BaseEncoder')
diff --git a/qt/python/mantidqt/project/decoderfactory.py b/qt/python/mantidqt/project/decoderfactory.py
index d1d80f5df93..e96800297a2 100644
--- a/qt/python/mantidqt/project/decoderfactory.py
+++ b/qt/python/mantidqt/project/decoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.usersubwindowfactory import UserSubWindowFactory
diff --git a/qt/python/mantidqt/project/encoderfactory.py b/qt/python/mantidqt/project/encoderfactory.py
index 1cb5b0426a8..c7718d7ea3f 100644
--- a/qt/python/mantidqt/project/encoderfactory.py
+++ b/qt/python/mantidqt/project/encoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from mantidqt.usersubwindowfactory import UserSubWindowFactory
diff --git a/qt/python/mantidqt/project/plotsloader.py b/qt/python/mantidqt/project/plotsloader.py
index 4b94e6fb50e..83d8be21902 100644
--- a/qt/python/mantidqt/project/plotsloader.py
+++ b/qt/python/mantidqt/project/plotsloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import copy
import matplotlib.axes
import matplotlib.cm as cm
diff --git a/qt/python/mantidqt/project/plotssaver.py b/qt/python/mantidqt/project/plotssaver.py
index 35c8f515006..81b97cfb8a6 100644
--- a/qt/python/mantidqt/project/plotssaver.py
+++ b/qt/python/mantidqt/project/plotssaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib.axis
from matplotlib import ticker
from matplotlib.image import AxesImage
diff --git a/qt/python/mantidqt/project/project.py b/qt/python/mantidqt/project/project.py
index ad6479ca678..69b99364abe 100644
--- a/qt/python/mantidqt/project/project.py
+++ b/qt/python/mantidqt/project/project.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
from qtpy.QtWidgets import QApplication, QFileDialog, QMessageBox
diff --git a/qt/python/mantidqt/project/projectloader.py b/qt/python/mantidqt/project/projectloader.py
index ddbeb37fdf1..20ff31c7eb7 100644
--- a/qt/python/mantidqt/project/projectloader.py
+++ b/qt/python/mantidqt/project/projectloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import json
import os
import re
diff --git a/qt/python/mantidqt/project/projectsaver.py b/qt/python/mantidqt/project/projectsaver.py
index 1e776b4d9e3..8f7ad52d686 100644
--- a/qt/python/mantidqt/project/projectsaver.py
+++ b/qt/python/mantidqt/project/projectsaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
from json import dump
diff --git a/qt/python/mantidqt/project/test/test_decoderfactory.py b/qt/python/mantidqt/project/test/test_decoderfactory.py
index 6310b24af6c..a56e0b33877 100644
--- a/qt/python/mantidqt/project/test/test_decoderfactory.py
+++ b/qt/python/mantidqt/project/test/test_decoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.decoderfactory import DecoderFactory
diff --git a/qt/python/mantidqt/project/test/test_encoderfactory.py b/qt/python/mantidqt/project/test/test_encoderfactory.py
index 86b4503dc51..4a202d2e177 100644
--- a/qt/python/mantidqt/project/test/test_encoderfactory.py
+++ b/qt/python/mantidqt/project/test/test_encoderfactory.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/python/mantidqt/project/test/test_plotsloader.py b/qt/python/mantidqt/project/test/test_plotsloader.py
index 68ed084547a..f36c8af49c0 100644
--- a/qt/python/mantidqt/project/test/test_plotsloader.py
+++ b/qt/python/mantidqt/project/test/test_plotsloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib
matplotlib.use('AGG')
diff --git a/qt/python/mantidqt/project/test/test_plotssaver.py b/qt/python/mantidqt/project/test/test_plotssaver.py
index 36c1bbe11a3..50da81010c3 100644
--- a/qt/python/mantidqt/project/test/test_plotssaver.py
+++ b/qt/python/mantidqt/project/test/test_plotssaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import matplotlib
import unittest
diff --git a/qt/python/mantidqt/project/test/test_project.py b/qt/python/mantidqt/project/test/test_project.py
index fc1f3a383b6..e0d8e56f338 100644
--- a/qt/python/mantidqt/project/test/test_project.py
+++ b/qt/python/mantidqt/project/test/test_project.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os
import tempfile
import unittest
diff --git a/qt/python/mantidqt/project/workspaceloader.py b/qt/python/mantidqt/project/workspaceloader.py
index 4a4fe5ef9aa..9d608aff732 100644
--- a/qt/python/mantidqt/project/workspaceloader.py
+++ b/qt/python/mantidqt/project/workspaceloader.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
from os import path
from mantid import logger
diff --git a/qt/python/mantidqt/project/workspacesaver.py b/qt/python/mantidqt/project/workspacesaver.py
index c8acb87604c..c3167fdcbad 100644
--- a/qt/python/mantidqt/project/workspacesaver.py
+++ b/qt/python/mantidqt/project/workspacesaver.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import os.path
from mantid.api import AnalysisDataService as ADS, IMDEventWorkspace
diff --git a/qt/python/mantidqt/test/test_import.py b/qt/python/mantidqt/test/test_import.py
index ff801071859..f17fe305259 100644
--- a/qt/python/mantidqt/test/test_import.py
+++ b/qt/python/mantidqt/test/test_import.py
@@ -4,8 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/usersubwindow.py b/qt/python/mantidqt/usersubwindow.py
index 5b9ebbc5330..de1ffec1452 100644
--- a/qt/python/mantidqt/usersubwindow.py
+++ b/qt/python/mantidqt/usersubwindow.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/usersubwindowfactory.py b/qt/python/mantidqt/usersubwindowfactory.py
index a945d40c4c6..898c6ebb56e 100644
--- a/qt/python/mantidqt/usersubwindowfactory.py
+++ b/qt/python/mantidqt/usersubwindowfactory.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/utils/asynchronous.py b/qt/python/mantidqt/utils/asynchronous.py
index de0c478de3d..84184d46640 100644
--- a/qt/python/mantidqt/utils/asynchronous.py
+++ b/qt/python/mantidqt/utils/asynchronous.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import ctypes
import sys
diff --git a/qt/python/mantidqt/utils/observer_pattern.py b/qt/python/mantidqt/utils/observer_pattern.py
index cf931b255e9..eb7b4fc47b8 100644
--- a/qt/python/mantidqt/utils/observer_pattern.py
+++ b/qt/python/mantidqt/utils/observer_pattern.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
diff --git a/qt/python/mantidqt/utils/test/test_modal_tester.py b/qt/python/mantidqt/utils/test/test_modal_tester.py
index 254ad2149ba..f34ed65902a 100644
--- a/qt/python/mantidqt/utils/test/test_modal_tester.py
+++ b/qt/python/mantidqt/utils/test/test_modal_tester.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
from qtpy.QtWidgets import QInputDialog
diff --git a/qt/python/mantidqt/utils/test/test_qt_utils.py b/qt/python/mantidqt/utils/test/test_qt_utils.py
index 298acefbcd9..bf9ee1d865d 100644
--- a/qt/python/mantidqt/utils/test/test_qt_utils.py
+++ b/qt/python/mantidqt/utils/test/test_qt_utils.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/utils/test/test_writetosignal.py b/qt/python/mantidqt/utils/test/test_writetosignal.py
index 5dc8c4c5e45..7e7096ca3ce 100644
--- a/qt/python/mantidqt/utils/test/test_writetosignal.py
+++ b/qt/python/mantidqt/utils/test/test_writetosignal.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
from qtpy.QtCore import QCoreApplication, QObject
import unittest
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
index 82ee2727536..b3e8d51e860 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
index 4e3d4cbf909..1ae255eea78 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat.mock import Mock
from mantidqt.utils.testing.mocks.mock_qt import MockQTab, MockQTableView
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
index a13b81f74e0..224fabe3673 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat.mock import Mock
from mantidqt.widgets.observers.observing_presenter import ObservingPresenter
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
index e690d97a03f..1a7035eba18 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
@@ -23,9 +23,6 @@ only the ones that have been necessary so far. If another function
needs to be mocked it can be freely added in the relevant class below
and it should not break any existing tests.
"""
-from __future__ import (absolute_import, division, print_function)
-
-
from mantid.py3compat.mock import Mock
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
index c6bb3b7192b..ed3ac79eed3 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/python/mantidqt/utils/writetosignal.py b/qt/python/mantidqt/utils/writetosignal.py
index 0e20fd62045..cf42760cc18 100644
--- a/qt/python/mantidqt/utils/writetosignal.py
+++ b/qt/python/mantidqt/utils/writetosignal.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
from qtpy.QtCore import QObject, Signal
diff --git a/qt/python/mantidqt/widgets/codeeditor/completion.py b/qt/python/mantidqt/widgets/codeeditor/completion.py
index 5635af79038..ebeb55db118 100644
--- a/qt/python/mantidqt/widgets/codeeditor/completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/completion.py
@@ -25,8 +25,6 @@ For these reasons it was agreed jedi would be dropped, possibly
revisiting when we move to Python 3.
"""
-from __future__ import (absolute_import, unicode_literals)
-
import ast
from collections import namedtuple
import contextlib
diff --git a/qt/python/mantidqt/widgets/codeeditor/editor.py b/qt/python/mantidqt/widgets/codeeditor/editor.py
index 24e8139123b..04c71cebc17 100644
--- a/qt/python/mantidqt/widgets/codeeditor/editor.py
+++ b/qt/python/mantidqt/widgets/codeeditor/editor.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# 3rd party imports
# local imports
diff --git a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
index 41e0dcf9a69..7d9919625ab 100644
--- a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import traceback
diff --git a/qt/python/mantidqt/widgets/codeeditor/interpreter.py b/qt/python/mantidqt/widgets/codeeditor/interpreter.py
index 862db7ebf7e..937dd2c80b7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/interpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/interpreter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, unicode_literals)
-
import io
import os.path
import sys
diff --git a/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py b/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
index 3def7f5f9db..19cb1124d71 100644
--- a/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/multifileinterpreter.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import os.path as osp
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py b/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
index d0a78c40f4a..a5a11e35bd5 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_codeeditor.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# system imports
import unittest
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
index ef1effd4bc6..dfb83499d0a 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import re
import unittest
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
index b4a5b3198b4..31f3dbe6ee4 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
@@ -7,8 +7,6 @@
#
# This file is part of the mantidqt package
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import sys
import traceback
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
index ac36b915c73..288f9e377fb 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
@@ -8,8 +8,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
# std imports
import sys
import traceback
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
index 4596e2cf323..1f8a2390ed7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
index b4583e98c19..022563dbf3c 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter_view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
index 0df872acaf6..77d68dab0eb 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
index 4d33075dffb..adc3ba40d8b 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/colorbar/colorbar.py b/qt/python/mantidqt/widgets/colorbar/colorbar.py
index 6c0e0c10611..069b34c7268 100644
--- a/qt/python/mantidqt/widgets/colorbar/colorbar.py
+++ b/qt/python/mantidqt/widgets/colorbar/colorbar.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.plots.utility import mpl_version_info, get_current_cmap
from mantidqt.MPLwidgets import FigureCanvas
from matplotlib.colorbar import Colorbar
diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
index eafb8e8d28e..d8326202508 100644
--- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
+++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, division, print_function)
-
from enum import Enum
from mantidqt.widgets.embedded_find_replace_dialog.view import EmbeddedFindReplaceDialogView
diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
index 68cba283542..8ec6e174efa 100644
--- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
+++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
-from __future__ import (absolute_import, division, print_function)
-
from unittest import TestCase
from mantid.py3compat.mock import Mock, patch
diff --git a/qt/python/mantidqt/widgets/filefinder/__init__.py b/qt/python/mantidqt/widgets/filefinder/__init__.py
index 7384daca550..0d7a0619616 100644
--- a/qt/python/mantidqt/widgets/filefinder/__init__.py
+++ b/qt/python/mantidqt/widgets/filefinder/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
FileFinder = import_qt('..._common', 'mantidqt.widgets.filefinder', 'MWRunFiles')
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
index 6c47b0a931e..510fd8d59e7 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from .view import AddFunctionDialogView
from mantidqt.interfacemanager import InterfaceManager
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
index b8d172d448f..987b87e04f5 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, Signal
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QCompleter, QDialog
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py b/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
index 2d9c6a67f13..5910630694e 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/fitpropertybrowser.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (print_function, absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, Signal, Slot
import matplotlib.pyplot
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py b/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
index 9133e99474b..e692ceaa94a 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/interactive_tool.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import QObject, Signal, Slot
from mantidqt.plotting.markers import PeakMarker, RangeMarker
diff --git a/qt/python/mantidqt/widgets/instrumentview/__init__.py b/qt/python/mantidqt/widgets/instrumentview/__init__.py
index fea27059e18..3a8621ded61 100644
--- a/qt/python/mantidqt/widgets/instrumentview/__init__.py
+++ b/qt/python/mantidqt/widgets/instrumentview/__init__.py
@@ -20,8 +20,6 @@ You can run this widget independently by for example:
window = InstrumentView(ws)
app.exec_()
"""
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy import PYQT4
diff --git a/qt/python/mantidqt/widgets/instrumentview/io.py b/qt/python/mantidqt/widgets/instrumentview/io.py
index 880fc2e465a..088ccbb759a 100644
--- a/qt/python/mantidqt/widgets/instrumentview/io.py
+++ b/qt/python/mantidqt/widgets/instrumentview/io.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
-
from mantid.api import AnalysisDataService as ADS
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/instrumentview/presenter.py b/qt/python/mantidqt/widgets/instrumentview/presenter.py
index 0f0a2fa6e5b..e4629aee494 100644
--- a/qt/python/mantidqt/widgets/instrumentview/presenter.py
+++ b/qt/python/mantidqt/widgets/instrumentview/presenter.py
@@ -10,8 +10,6 @@
"""
Contains the presenter for displaying the InstrumentWidget
"""
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
from mantidqt.widgets.observers.observing_presenter import ObservingPresenter
from .view import InstrumentView
diff --git a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
index c59d7b2fb25..3e34fe62d2e 100644
--- a/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
+++ b/qt/python/mantidqt/widgets/instrumentview/test/test_instrumentview_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package
#
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import unittest
from mantidqt.project.encoderfactory import EncoderFactory
diff --git a/qt/python/mantidqt/widgets/instrumentview/view.py b/qt/python/mantidqt/widgets/instrumentview/view.py
index 36ca948edd9..252f6792f40 100644
--- a/qt/python/mantidqt/widgets/instrumentview/view.py
+++ b/qt/python/mantidqt/widgets/instrumentview/view.py
@@ -10,8 +10,6 @@
"""
Contains the Python wrapper class for the C++ instrument widget
"""
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy.QtCore import Qt, Signal, Slot
from qtpy.QtWidgets import QVBoxLayout, QWidget
diff --git a/qt/python/mantidqt/widgets/jobtreeview/__init__.py b/qt/python/mantidqt/widgets/jobtreeview/__init__.py
index 52124cdf06b..ac5f84908ad 100644
--- a/qt/python/mantidqt/widgets/jobtreeview/__init__.py
+++ b/qt/python/mantidqt/widgets/jobtreeview/__init__.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
Cell = import_qt('..._common', 'mantidqt.widgets.jobtreeview', 'Cell')
diff --git a/qt/python/mantidqt/widgets/manageuserdirectories.py b/qt/python/mantidqt/widgets/manageuserdirectories.py
index 449e0d5cc26..79c3a3aff27 100644
--- a/qt/python/mantidqt/widgets/manageuserdirectories.py
+++ b/qt/python/mantidqt/widgets/manageuserdirectories.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
ManageUserDirectories = import_qt('.._common', 'mantidqt.widgets', 'ManageUserDirectories')
diff --git a/qt/python/mantidqt/widgets/messagedisplay.py b/qt/python/mantidqt/widgets/messagedisplay.py
index 7c413883acf..843c3985339 100644
--- a/qt/python/mantidqt/widgets/messagedisplay.py
+++ b/qt/python/mantidqt/widgets/messagedisplay.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtWidgets import QAction, QActionGroup
from qtpy.QtGui import QFont
diff --git a/qt/python/mantidqt/widgets/observers/ads_observer.py b/qt/python/mantidqt/widgets/observers/ads_observer.py
index a1e3372b99f..90e2a2f288d 100644
--- a/qt/python/mantidqt/widgets/observers/ads_observer.py
+++ b/qt/python/mantidqt/widgets/observers/ads_observer.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import sys
from functools import wraps
diff --git a/qt/python/mantidqt/widgets/observers/observing_presenter.py b/qt/python/mantidqt/widgets/observers/observing_presenter.py
index 37f1dd12913..3453bd63784 100644
--- a/qt/python/mantidqt/widgets/observers/observing_presenter.py
+++ b/qt/python/mantidqt/widgets/observers/observing_presenter.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-
class ObservingPresenter(object):
"""
This class provides some common functions for classes that need to be observable.
diff --git a/qt/python/mantidqt/widgets/observers/observing_view.py b/qt/python/mantidqt/widgets/observers/observing_view.py
index ed507045d37..ba42da7920b 100644
--- a/qt/python/mantidqt/widgets/observers/observing_view.py
+++ b/qt/python/mantidqt/widgets/observers/observing_view.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
-
class ObservingView(object):
"""
This class provides some common functions needed across views observers the ADS.
diff --git a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
index 6c3bf71b628..60b69e8f4b7 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat.mock import Mock
diff --git a/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py b/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
index 1fb7db9de19..3dbf84c398d 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_observing_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantidqt.utils.testing.mocks.mock_observing import MockObservingPresenter
diff --git a/qt/python/mantidqt/widgets/observers/test/test_observing_view.py b/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
index aba39e6fdec..c83cd90e45f 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_observing_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantidqt.utils.testing.mocks.mock_observing import MockObservingView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
index 87763f23751..58ef4a89010 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.axes import ErrorbarContainer
from matplotlib.collections import QuadMesh
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
index 40d396400da..ab0085f03ae 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
-
class AxProperties(dict):
"""
An object to store the properties that can be set in the Axes
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
index 343ea46b109..982a686cd6f 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_axes_names_dict
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.axestabwidget.view import AxesTabWidgetView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
index 9f4698acb99..370d464a71d 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
index 7e923bcbee7..c8924fb4bb1 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QDoubleValidator
from qtpy.QtWidgets import QWidget, QMessageBox
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py b/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
index dc7db8c600d..20916eb4366 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/colorselector.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.legend import convert_color_to_hex
from matplotlib import rcParams
from qtpy.QtCore import QRegExp
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
index 343a8a03bd7..1acaabb712c 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib import rcParams
from matplotlib.axes import ErrorbarContainer
from matplotlib.lines import Line2D
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
index b63e862e61e..c9ac5f9f384 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
index 8e0e7362e71..a762c27b899 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
index 20351fcff3e..b8a39c9bce8 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
index 98b15e08b25..56724d8c1f2 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import PolyCollection
from matplotlib.lines import Line2D
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
index 757762013dc..da4b0243a00 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curveproperties.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
index d0624716125..906bc0e73b1 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
index 6b40e0d88ce..25ad138fa85 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
index 7b773102641..40c77756bab 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/__init__.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import QuadMesh
from matplotlib.colors import LogNorm
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
index 0ccbe31e90d..a635b873fc9 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.datafunctions import update_colorbar_scale
from mantidqt.utils.qt import block_signals
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_images_from_fig
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
index 8dfa5554b0b..07fafd71878 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import numpy as np
from matplotlib.colors import LogNorm, Normalize
from matplotlib import cm
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
index 3daba515629..e4ea50b4889 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt, QSize
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
index 62717edb751..a6ebb26d695 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantid.plots.legend import LegendProperties
from mantidqt.widgets.plotconfigdialog.legendtabwidget.view import LegendTabWidgetView
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
index 320506a1ced..f414d3cd653 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QWidget
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
index 547f4ef1ed5..89455efc511 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.plotconfigdialog import curve_in_figure, image_in_figure, legend_in_figure
from mantidqt.widgets.plotconfigdialog.view import PlotConfigDialogView
from mantidqt.widgets.plotconfigdialog.axestabwidget.presenter import AxesTabWidgetPresenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
index 3e003acfd58..434be721e0e 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib import use as mpl_use
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/view.py
index c15bb639b02..6e71d2df0f6 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/samplelogs/model.py b/qt/python/mantidqt/widgets/samplelogs/model.py
index 8b20520ada9..a98feafc801 100644
--- a/qt/python/mantidqt/widgets/samplelogs/model.py
+++ b/qt/python/mantidqt/widgets/samplelogs/model.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import (BoolTimeSeriesProperty,
FloatTimeSeriesProperty, Int32TimeSeriesProperty,
Int64TimeSeriesProperty, StringTimeSeriesProperty, logger)
diff --git a/qt/python/mantidqt/widgets/samplelogs/presenter.py b/qt/python/mantidqt/widgets/samplelogs/presenter.py
index 5498c3fc910..bab138a7088 100644
--- a/qt/python/mantidqt/widgets/samplelogs/presenter.py
+++ b/qt/python/mantidqt/widgets/samplelogs/presenter.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from .model import SampleLogsModel
from .view import SampleLogsView
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
index 19e6c582a4b..022452e71b7 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import LoadEventNexus, CreateMDWorkspace
from mantidqt.widgets.samplelogs.model import SampleLogsModel
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
index e373f06c99e..c01ebf7c573 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('Agg') # noqa: E402
import unittest
diff --git a/qt/python/mantidqt/widgets/samplelogs/view.py b/qt/python/mantidqt/widgets/samplelogs/view.py
index 7c6299a265f..6bad261fc1f 100644
--- a/qt/python/mantidqt/widgets/samplelogs/view.py
+++ b/qt/python/mantidqt/widgets/samplelogs/view.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QTableView, QHBoxLayout, QVBoxLayout,
QAbstractItemView, QFormLayout, QLineEdit,
QHeaderView, QLabel, QCheckBox, QMenu,
diff --git a/qt/python/mantidqt/widgets/scriptrepository.py b/qt/python/mantidqt/widgets/scriptrepository.py
index b4b1182608b..9a9883e6bb6 100644
--- a/qt/python/mantidqt/widgets/scriptrepository.py
+++ b/qt/python/mantidqt/widgets/scriptrepository.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
index 9afa7bd0523..d1c90eacb4d 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QLabel, QPushButton, QSlider, QDoubleSpinBox, QSpinBox
from qtpy.QtCore import Qt, Signal
from mantid.py3compat.enum import Enum
diff --git a/qt/python/mantidqt/widgets/sliceviewer/model.py b/qt/python/mantidqt/widgets/sliceviewer/model.py
index 43b76f1a092..4d33e182a36 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/model.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/model.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from mantid.plots.datafunctions import get_indices
from mantid.api import MatrixWorkspace, MultipleExperimentInfos
from mantid.simpleapi import BinMD
diff --git a/qt/python/mantidqt/widgets/sliceviewer/presenter.py b/qt/python/mantidqt/widgets/sliceviewer/presenter.py
index c82acf7910b..45f2716e433 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/presenter.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/presenter.py
@@ -7,7 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
from .model import SliceViewerModel, WS_TYPE
from .view import SliceViewerView
import mantid.api
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
index 4c0916b97e8..b1302a3a58c 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateMDHistoWorkspace, CreateWorkspace, CreateMDWorkspace, FakeMDEventData
from mantidqt.widgets.sliceviewer.model import SliceViewerModel, WS_TYPE
from numpy.testing import assert_equal, assert_allclose
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
index 1b807d4d453..b299f86fd65 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import matplotlib
matplotlib.use('Agg') # noqa: E402
import unittest
diff --git a/qt/python/mantidqt/widgets/sliceviewer/toolbar.py b/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
index c3e1191cb17..0de17f733dc 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/toolbar.py
@@ -8,8 +8,7 @@
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
from mantidqt.MPLwidgets import NavigationToolbar2QT
from mantidqt.icons import get_icon
from qtpy.QtCore import Signal, Qt, QSize
diff --git a/qt/python/mantidqt/widgets/sliceviewer/view.py b/qt/python/mantidqt/widgets/sliceviewer/view.py
index 50d6307d4dc..67e27a477c0 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/view.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib import gridspec
from matplotlib.figure import Figure
from matplotlib.transforms import Bbox, BboxTransform
diff --git a/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py b/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
index 0bbb1e0b91e..c679e41b748 100644
--- a/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
+++ b/qt/python/mantidqt/widgets/test/test_fitpropertybrowserbase.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import platform
import sys
import unittest
diff --git a/qt/python/mantidqt/widgets/test/test_functionbrowser.py b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
index 5cf6660a9f7..8d5b7a55164 100644
--- a/qt/python/mantidqt/widgets/test/test_functionbrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/test/test_jupyterconsole.py b/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
index 588df0fd83d..a1b84668154 100644
--- a/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
+++ b/qt/python/mantidqt/widgets/test/test_jupyterconsole.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import)
-
# system imports
# import readline (if available) before QApplication starts to avoid segfault with IPython 5 and Python 3
try:
diff --git a/qt/python/mantidqt/widgets/test/test_messagedisplay.py b/qt/python/mantidqt/widgets/test/test_messagedisplay.py
index 7ea86346dcc..ab28aed6d53 100644
--- a/qt/python/mantidqt/widgets/test/test_messagedisplay.py
+++ b/qt/python/mantidqt/widgets/test/test_messagedisplay.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/widgets/test/test_scriptrepository.py b/qt/python/mantidqt/widgets/test/test_scriptrepository.py
index 4cc0bb8e86d..3be7488862c 100644
--- a/qt/python/mantidqt/widgets/test/test_scriptrepository.py
+++ b/qt/python/mantidqt/widgets/test/test_scriptrepository.py
@@ -7,8 +7,7 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function,
- unicode_literals)
+
import unittest
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
index 14c9052fb71..e51c888c9ac 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from matplotlib.collections import PolyCollection
from mantid.plots import datafunctions
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
index b105f6a10f2..0d598d946f0 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
index 3d1b5c554cc..d250d8e6b76 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib.collections import PolyCollection
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
index 84a54916f0b..3108abf11e2 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
index d4649f5e6d8..79671b71fbc 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
index 10401c4e3e3..8a22ab17dd6 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.widgets.waterfallplotoffsetdialog.view import WaterfallPlotOffsetDialogView
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
index b105f6a10f2..0d598d946f0 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
@@ -6,4 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
index f2c2e1de134..145858cf5d1 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from matplotlib.pyplot import figure
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
index 5f10de04bc9..b4441f6558f 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
from qtpy.QtCore import Qt
from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialog
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/__init__.py b/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
index 2a0da4d3236..896aed8278b 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/__init__.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, unicode_literals)
-
# 3rdparty imports
from qtpy import PYQT4
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py b/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
index a8e51b62402..a1d50522cdb 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/data_copier.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui
from qtpy.QtWidgets import QMessageBox
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
index 159247f38d5..9aaa549df62 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/model.py
@@ -8,8 +8,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import MatrixWorkspace
from mantid.dataobjects import EventWorkspace, Workspace2D
from mantidqt.widgets.workspacedisplay.matrix.table_view_model import MatrixWorkspaceTableViewModel, \
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
index acdc39da846..fe8403749c8 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py
@@ -8,8 +8,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui
from qtpy.QtCore import QVariant, Qt, QAbstractTableModel
from enum import Enum
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
index db27c672e99..f6641acaf67 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat.mock import Mock
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
index a77180a93d0..b422d72c792 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtWidgets import QStatusBar
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
index ddca1f42eb1..fad62358e4e 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/view.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
from functools import partial
from qtpy import QtGui
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/model.py b/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
index 99738ce70c2..8d1d5e3f4e3 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/model.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# coding=utf-8
# This file is part of the mantidqt package.
-from __future__ import (absolute_import, division, print_function)
-
from mantid.dataobjects import PeaksWorkspace, TableWorkspace
from mantid.kernel import V3D
from mantid.simpleapi import DeleteTableRows, SortPeaksWorkspace, SortTableWorkspace, StatisticsOfTableWorkspace
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
index 3f27e21eca9..c84680bf59d 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-from __future__ import (absolute_import, print_function)
-
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
index 324f2c0ff30..6d29940a419 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_marked_columns.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from itertools import permutations
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
index fcd8ad23220..814bce75866 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import functools
import unittest
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
index 682f09c1820..d9118f2e3d4 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtWidgets import QStatusBar
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
index c2744fbc893..e51fa582887 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, print_function)
-
import unittest
from qtpy.QtWidgets import QApplication
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
index b21691ebf17..2a9c7ae5cd7 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_workbench_table_widget_item.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtCore import Qt
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/view.py b/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
index dc7d2874e9a..971f0b66ccf 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/view.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
-from __future__ import (absolute_import, division, print_function)
-
import sys
from functools import partial
diff --git a/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py b/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
index e811f53c2ff..1a4366a64ac 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/algorithmhistorywindow.py
@@ -7,8 +7,6 @@
# This file is part of the mantid workbench.
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py b/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
index 6dc646142c8..1f8498b6bde 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/mantidtreemodel.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import)
-
from mantidqt.utils.qt import import_qt
diff --git a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
index d099ad33ed4..2810a33ba80 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
@@ -7,8 +7,6 @@
# This file is part of the mantidqt package
#
#
-from __future__ import (absolute_import, unicode_literals)
-
from mantidqt.utils.qt import import_qt
WorkspaceTreeWidget = import_qt('..._common', 'mantidqt.widgets.workspacewidget', 'WorkspaceTreeWidgetSimple')
diff --git a/qt/widgets/common/test/MWRunFilesTest.py b/qt/widgets/common/test/MWRunFilesTest.py
index f01d47e254d..ee9e01e7499 100644
--- a/qt/widgets/common/test/MWRunFilesTest.py
+++ b/qt/widgets/common/test/MWRunFilesTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
import unittest
from PyQt4 import QtCore, QtGui
diff --git a/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py b/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
index 683242097f5..26c70a5f0bc 100644
--- a/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
+++ b/qt/widgets/sliceviewer/test/SliceViewerPythonInterfaceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
import sys
import os
diff --git a/scripts/AbinsModules/AbinsConstants.py b/scripts/AbinsModules/AbinsConstants.py
index ef9c931b2cd..cecccd7235a 100644
--- a/scripts/AbinsModules/AbinsConstants.py
+++ b/scripts/AbinsModules/AbinsConstants.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
import numpy as np
from scipy import constants
diff --git a/scripts/AbinsModules/AbinsData.py b/scripts/AbinsModules/AbinsData.py
index 9f2136dbe12..a4b57b0fae7 100644
--- a/scripts/AbinsModules/AbinsData.py
+++ b/scripts/AbinsModules/AbinsData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/AbinsTestHelpers.py b/scripts/AbinsModules/AbinsTestHelpers.py
index a1a052e7e9a..f6fc2a952c9 100644
--- a/scripts/AbinsModules/AbinsTestHelpers.py
+++ b/scripts/AbinsModules/AbinsTestHelpers.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
diff --git a/scripts/AbinsModules/AtomsData.py b/scripts/AbinsModules/AtomsData.py
index 74b5a0d3e68..aaa127c7fc1 100644
--- a/scripts/AbinsModules/AtomsData.py
+++ b/scripts/AbinsModules/AtomsData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import six
import AbinsModules
diff --git a/scripts/AbinsModules/CalculateDWSingleCrystal.py b/scripts/AbinsModules/CalculateDWSingleCrystal.py
index 01d15b67d09..8299c92fd46 100644
--- a/scripts/AbinsModules/CalculateDWSingleCrystal.py
+++ b/scripts/AbinsModules/CalculateDWSingleCrystal.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
# Abins modules
diff --git a/scripts/AbinsModules/CalculatePowder.py b/scripts/AbinsModules/CalculatePowder.py
index 9448b023d0c..291fe748b16 100644
--- a/scripts/AbinsModules/CalculatePowder.py
+++ b/scripts/AbinsModules/CalculatePowder.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import AbinsModules
from AbinsModules import AbinsParameters
diff --git a/scripts/AbinsModules/CalculateS.py b/scripts/AbinsModules/CalculateS.py
index 9a6bb5eed04..5b7e3a19422 100644
--- a/scripts/AbinsModules/CalculateS.py
+++ b/scripts/AbinsModules/CalculateS.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import AbinsModules
diff --git a/scripts/AbinsModules/CalculateSingleCrystal.py b/scripts/AbinsModules/CalculateSingleCrystal.py
index 86ed8f595eb..6ef6bcb6a83 100644
--- a/scripts/AbinsModules/CalculateSingleCrystal.py
+++ b/scripts/AbinsModules/CalculateSingleCrystal.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/DWSingleCrystalData.py b/scripts/AbinsModules/DWSingleCrystalData.py
index 0efbf26b034..04aa060504e 100644
--- a/scripts/AbinsModules/DWSingleCrystalData.py
+++ b/scripts/AbinsModules/DWSingleCrystalData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import six
diff --git a/scripts/AbinsModules/FrequencyPowderGenerator.py b/scripts/AbinsModules/FrequencyPowderGenerator.py
index 3620b009348..cf8c4a0f727 100644
--- a/scripts/AbinsModules/FrequencyPowderGenerator.py
+++ b/scripts/AbinsModules/FrequencyPowderGenerator.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import AbinsModules
diff --git a/scripts/AbinsModules/GeneralAbInitioParser.py b/scripts/AbinsModules/GeneralAbInitioParser.py
index 8556d246b6d..efbc50311a8 100644
--- a/scripts/AbinsModules/GeneralAbInitioParser.py
+++ b/scripts/AbinsModules/GeneralAbInitioParser.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import six
import re
import AbinsModules
diff --git a/scripts/AbinsModules/GeneralAbInitioProgram.py b/scripts/AbinsModules/GeneralAbInitioProgram.py
index b44d55dcac0..d8de840ad56 100644
--- a/scripts/AbinsModules/GeneralAbInitioProgram.py
+++ b/scripts/AbinsModules/GeneralAbInitioProgram.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import logger
import AbinsModules
import six
diff --git a/scripts/AbinsModules/GeneralData.py b/scripts/AbinsModules/GeneralData.py
index f5e0deccecd..43e8528cc9b 100644
--- a/scripts/AbinsModules/GeneralData.py
+++ b/scripts/AbinsModules/GeneralData.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class GeneralData(object):
def __init__(self):
diff --git a/scripts/AbinsModules/GeneralLoadAbInitioTester.py b/scripts/AbinsModules/GeneralLoadAbInitioTester.py
index a1775656b91..a27fe6d8f92 100644
--- a/scripts/AbinsModules/GeneralLoadAbInitioTester.py
+++ b/scripts/AbinsModules/GeneralLoadAbInitioTester.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import json
import numpy as np
diff --git a/scripts/AbinsModules/IOmodule.py b/scripts/AbinsModules/IOmodule.py
index 008843815b4..0c4e5895b97 100644
--- a/scripts/AbinsModules/IOmodule.py
+++ b/scripts/AbinsModules/IOmodule.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import hashlib
import io
import json
diff --git a/scripts/AbinsModules/InstrumentProducer.py b/scripts/AbinsModules/InstrumentProducer.py
index 551c71e9716..01e5ea54456 100644
--- a/scripts/AbinsModules/InstrumentProducer.py
+++ b/scripts/AbinsModules/InstrumentProducer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from AbinsModules.Instruments import ToscaInstrument
from AbinsModules import AbinsConstants
diff --git a/scripts/AbinsModules/Instruments/Broadening.py b/scripts/AbinsModules/Instruments/Broadening.py
index 843e55ab28a..4ea2d6b151c 100644
--- a/scripts/AbinsModules/Instruments/Broadening.py
+++ b/scripts/AbinsModules/Instruments/Broadening.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from scipy.special import erf
from scipy.signal import convolve
diff --git a/scripts/AbinsModules/Instruments/Instrument.py b/scripts/AbinsModules/Instruments/Instrument.py
index 02c7887a6c9..8df59ef63e8 100644
--- a/scripts/AbinsModules/Instruments/Instrument.py
+++ b/scripts/AbinsModules/Instruments/Instrument.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
# noinspection PyPep8Naming
class Instrument(object):
diff --git a/scripts/AbinsModules/Instruments/ToscaInstrument.py b/scripts/AbinsModules/Instruments/ToscaInstrument.py
index 7b5c83a3f3f..668b6115d3b 100644
--- a/scripts/AbinsModules/Instruments/ToscaInstrument.py
+++ b/scripts/AbinsModules/Instruments/ToscaInstrument.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
from .Instrument import Instrument
from .Broadening import broaden_spectrum, prebin_required_schemes
diff --git a/scripts/AbinsModules/Instruments/__init__.py b/scripts/AbinsModules/Instruments/__init__.py
index cb3c293c5c5..87179b99f85 100644
--- a/scripts/AbinsModules/Instruments/__init__.py
+++ b/scripts/AbinsModules/Instruments/__init__.py
@@ -5,7 +5,5 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# flake8: noqa
-from __future__ import (absolute_import, division, print_function)
-
from .ToscaInstrument import ToscaInstrument
from .Instrument import Instrument
diff --git a/scripts/AbinsModules/KpointsData.py b/scripts/AbinsModules/KpointsData.py
index 010f6853596..c3d3a637565 100644
--- a/scripts/AbinsModules/KpointsData.py
+++ b/scripts/AbinsModules/KpointsData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import six
import AbinsModules
diff --git a/scripts/AbinsModules/LoadCASTEP.py b/scripts/AbinsModules/LoadCASTEP.py
index 37bbcf346c8..0a031da8dba 100644
--- a/scripts/AbinsModules/LoadCASTEP.py
+++ b/scripts/AbinsModules/LoadCASTEP.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import re
import AbinsModules
diff --git a/scripts/AbinsModules/LoadCRYSTAL.py b/scripts/AbinsModules/LoadCRYSTAL.py
index b90545a6d29..51b8a557ba3 100644
--- a/scripts/AbinsModules/LoadCRYSTAL.py
+++ b/scripts/AbinsModules/LoadCRYSTAL.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import io
import six
import numpy as np
diff --git a/scripts/AbinsModules/LoadDMOL3.py b/scripts/AbinsModules/LoadDMOL3.py
index 0f028fb9a76..63b53767be0 100644
--- a/scripts/AbinsModules/LoadDMOL3.py
+++ b/scripts/AbinsModules/LoadDMOL3.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import io
import six
diff --git a/scripts/AbinsModules/LoadGAUSSIAN.py b/scripts/AbinsModules/LoadGAUSSIAN.py
index 62e61cea629..24655f61968 100644
--- a/scripts/AbinsModules/LoadGAUSSIAN.py
+++ b/scripts/AbinsModules/LoadGAUSSIAN.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
import io
import six
diff --git a/scripts/AbinsModules/PowderData.py b/scripts/AbinsModules/PowderData.py
index 8ec142a081e..4efcc514794 100644
--- a/scripts/AbinsModules/PowderData.py
+++ b/scripts/AbinsModules/PowderData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import six
import AbinsModules
diff --git a/scripts/AbinsModules/SData.py b/scripts/AbinsModules/SData.py
index 04d410f17ac..5c45012a8a3 100644
--- a/scripts/AbinsModules/SData.py
+++ b/scripts/AbinsModules/SData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.kernel import logger as mantid_logger
import AbinsModules
diff --git a/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py b/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
index fb9e69332f9..84e097f0300 100644
--- a/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
+++ b/scripts/AbinsModules/SPowderSemiEmpiricalCalculator.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
from AbinsModules import AbinsParameters, AbinsConstants
import gc
diff --git a/scripts/AbinsModules/SingleCrystalData.py b/scripts/AbinsModules/SingleCrystalData.py
index 39e0e81dcc1..b18b9dd5caa 100644
--- a/scripts/AbinsModules/SingleCrystalData.py
+++ b/scripts/AbinsModules/SingleCrystalData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import AbinsModules
diff --git a/scripts/AbinsModules/__init__.py b/scripts/AbinsModules/__init__.py
index f7f017454ea..ba8624e18bc 100644
--- a/scripts/AbinsModules/__init__.py
+++ b/scripts/AbinsModules/__init__.py
@@ -6,9 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# flake8: noqa
-from __future__ import (absolute_import, division, print_function)
-
-
from .IOmodule import IOmodule
# Frequency generator
diff --git a/scripts/CrystalTools/PeakReport.py b/scripts/CrystalTools/PeakReport.py
index d9ddd21262c..8afcda27fe7 100644
--- a/scripts/CrystalTools/PeakReport.py
+++ b/scripts/CrystalTools/PeakReport.py
@@ -8,7 +8,6 @@
"""
This is a module for creating peak integration reports.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.api
from mantidplot import plotSlice
diff --git a/scripts/DGSPlanner.py b/scripts/DGSPlanner.py
index d1a5cb0b49a..2151e9e2ede 100644
--- a/scripts/DGSPlanner.py
+++ b/scripts/DGSPlanner.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,unused-import
-from __future__ import (absolute_import, division, print_function)
import sys
from DGSPlanner import DGSPlannerGUI
from mantidqt.gui_helper import get_qapplication
diff --git a/scripts/DGSPlanner/ClassicUBInputWidget.py b/scripts/DGSPlanner/ClassicUBInputWidget.py
index 1dcbe720806..e1bd1493b90 100644
--- a/scripts/DGSPlanner/ClassicUBInputWidget.py
+++ b/scripts/DGSPlanner/ClassicUBInputWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtGui, QtCore
import sys
import mantid
diff --git a/scripts/DGSPlanner/DGSPlannerGUI.py b/scripts/DGSPlanner/DGSPlannerGUI.py
index af6e49f7a9c..ad54f83348a 100644
--- a/scripts/DGSPlanner/DGSPlannerGUI.py
+++ b/scripts/DGSPlanner/DGSPlannerGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,relative-import
-from __future__ import (absolute_import, division, print_function)
from . import InstrumentSetupWidget
from . import ClassicUBInputWidget
from . import MatrixUBInputWidget
diff --git a/scripts/DGSPlanner/DimensionSelectorWidget.py b/scripts/DGSPlanner/DimensionSelectorWidget.py
index f3137f95033..32e19314b67 100644
--- a/scripts/DGSPlanner/DimensionSelectorWidget.py
+++ b/scripts/DGSPlanner/DimensionSelectorWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes,super-on-old-class,too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui, QtCore, QtWidgets
import sys
import numpy
diff --git a/scripts/DGSPlanner/InstrumentSetupWidget.py b/scripts/DGSPlanner/InstrumentSetupWidget.py
index e663c0dd9d2..4257fa03535 100644
--- a/scripts/DGSPlanner/InstrumentSetupWidget.py
+++ b/scripts/DGSPlanner/InstrumentSetupWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-instance-attributes,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui, QtCore, QtWidgets
import sys
import mantid
diff --git a/scripts/DGSPlanner/LoadNexusUB.py b/scripts/DGSPlanner/LoadNexusUB.py
index 54cc854ab67..047286e3803 100644
--- a/scripts/DGSPlanner/LoadNexusUB.py
+++ b/scripts/DGSPlanner/LoadNexusUB.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.simpleapi import *
diff --git a/scripts/DGSPlanner/MatrixUBInputWidget.py b/scripts/DGSPlanner/MatrixUBInputWidget.py
index 47b8f200d69..c57ef80386c 100644
--- a/scripts/DGSPlanner/MatrixUBInputWidget.py
+++ b/scripts/DGSPlanner/MatrixUBInputWidget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-name-in-module,too-many-public-methods
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtGui, QtWidgets
import sys
import mantid
diff --git a/scripts/DGSPlanner/ValidateOL.py b/scripts/DGSPlanner/ValidateOL.py
index daff258ef62..c438f8a0868 100644
--- a/scripts/DGSPlanner/ValidateOL.py
+++ b/scripts/DGSPlanner/ValidateOL.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,bare-except
-from __future__ import (absolute_import, division, print_function)
import mantid
import numpy
diff --git a/scripts/DGS_Reduction.py b/scripts/DGS_Reduction.py
index 99e0878803c..2557ac17852 100644
--- a/scripts/DGS_Reduction.py
+++ b/scripts/DGS_Reduction.py
@@ -8,7 +8,6 @@
"""
Script used to start the DGS reduction GUI from MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_application import ReductionGUI
reducer = ReductionGUI(instrument_list=["ARCS", "CNCS", "HYSPEC", "MAPS",
diff --git a/scripts/DiamondAttenuationCorrection/FitTrans.py b/scripts/DiamondAttenuationCorrection/FitTrans.py
index bba1a3bd336..1289e12b554 100644
--- a/scripts/DiamondAttenuationCorrection/FitTrans.py
+++ b/scripts/DiamondAttenuationCorrection/FitTrans.py
@@ -19,7 +19,6 @@ Data types:
***
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
from matplotlib import pyplot as plt
import numpy as np
import itertools as itt
diff --git a/scripts/DiamondAttenuationCorrection/FitTransReadUB.py b/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
index 30e27f3c00b..a30965f27da 100644
--- a/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
+++ b/scripts/DiamondAttenuationCorrection/FitTransReadUB.py
@@ -19,7 +19,6 @@ Data types:
***
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
from matplotlib import pyplot as plt
import numpy as np
import itertools as itt
diff --git a/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py b/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
index 3f16202fb08..4ab94557fe9 100644
--- a/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
+++ b/scripts/DiamondAttenuationCorrection/UBMatrixGenerator.py
@@ -10,7 +10,6 @@ Identifies upstream and downstream diamonds and assigns matrices to them
'''
# Import all needed libraries
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import itertools as itt
diff --git a/scripts/Diffraction/isis_powder/__init__.py b/scripts/Diffraction/isis_powder/__init__.py
index b4fa960144b..108af00a69a 100644
--- a/scripts/Diffraction/isis_powder/__init__.py
+++ b/scripts/Diffraction/isis_powder/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Disable unused import warnings. The import is for user convenience
# Bring instruments into package namespace
from .gem import Gem # noqa: F401
diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py
index 5d0527b98fe..7a2951ae333 100644
--- a/scripts/Diffraction/isis_powder/abstract_inst.py
+++ b/scripts/Diffraction/isis_powder/abstract_inst.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.routines import calibrate, focus, common, common_enums, common_output
from mantid.kernel import config, logger
diff --git a/scripts/Diffraction/isis_powder/gem.py b/scripts/Diffraction/isis_powder/gem.py
index 3ad4b27b895..74b5e36671e 100644
--- a/scripts/Diffraction/isis_powder/gem.py
+++ b/scripts/Diffraction/isis_powder/gem.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
index 069ef627f57..9d29951c8de 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from isis_powder.routines.common import ADVANCED_CONFIG as COMMON_ADVANCED_CONFIG
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
index b9a9a87b122..6170315b2a8 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines import absorb_corrections, common
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py b/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
index 44eef7e076e..f91a8d5fc2f 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_calibration_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
index 2d50a547488..b6ed3cc38f2 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class GEM_CHOPPER_MODES(object):
enum_friendly_name = "Gem chopper modes"
PDF = "PDF"
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_output.py b/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
index 7c6603e8e9d..de8fd4c5fa9 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
index cfcd44e6e04..e7ae385b573 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.gem_routines.gem_enums import GEM_CHOPPER_MODES
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
diff --git a/scripts/Diffraction/isis_powder/hrpd.py b/scripts/Diffraction/isis_powder/hrpd.py
index a55065ee150..9055f8c684d 100644
--- a/scripts/Diffraction/isis_powder/hrpd.py
+++ b/scripts/Diffraction/isis_powder/hrpd.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
index 0f1113854e7..93eaa0f1e9c 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.hrpd_routines.hrpd_enums import HRPD_TOF_WINDOWS
absorption_correction_params = {
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
index 906b90866b6..2dde439e909 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.hrpd_routines import hrpd_advanced_config
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
index b54c973da7e..951fc4615c7 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class HRPD_TOF_WINDOWS(object):
enum_friendly_name = "TOF windows"
window_10_50 = "10-50"
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
index 443848545a6..5131937d160 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.hrpd_routines.hrpd_enums import HRPD_MODES, HRPD_TOF_WINDOWS
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
from isis_powder.routines.param_map_entry import ParamMapEntry
diff --git a/scripts/Diffraction/isis_powder/pearl.py b/scripts/Diffraction/isis_powder/pearl.py
index 7b391a35eb8..ac106f99bb2 100644
--- a/scripts/Diffraction/isis_powder/pearl.py
+++ b/scripts/Diffraction/isis_powder/pearl.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from contextlib import contextmanager
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
index 978a24d0d66..22302dbb14b 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_advanced_config.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from numpy import array
general_params = {
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
index e697118c202..f94c254e396 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
index 03bf602e55b..180830647ef 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_calibration_algs.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
index b12801d0552..4c91b13879a 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class PEARL_FOCUS_MODES(object):
enum_friendly_name = "focus modes"
all = "all"
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
index 4a6a9fa2a46..605c7997f64 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines.common_enums import WORKSPACE_UNITS
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
index e0508d6ae66..2514081153d 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.common import PARAM_MAPPING
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.pearl_routines.pearl_enums import PEARL_FOCUS_MODES, PEARL_TT_MODES
diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py
index 0dfd83cb460..0c80b633fde 100644
--- a/scripts/Diffraction/isis_powder/polaris.py
+++ b/scripts/Diffraction/isis_powder/polaris.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from isis_powder.routines import absorb_corrections, common, instrument_settings
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
index 8cd626c228d..21d9f4893b0 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_advanced_config.py
@@ -7,8 +7,6 @@
# Note all changes in this file require a restart of Mantid
# additionally any long term changes should be sent back to the development team so any changes can be merged
# into future versions of Mantid.
-from __future__ import (absolute_import, unicode_literals)
-
import copy
from isis_powder.routines.common import ADVANCED_CONFIG as COMMON_ADVANCED_CONFIG
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index f8c015e93bd..6a2578bda8d 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
index 3147259db17..7f52d43b70b 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class POLARIS_CHOPPER_MODES(object):
enum_friendly_name = "Polaris chopper modes"
PDF = "PDF"
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
index cb2e721b2ec..3b26bb1f2cd 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines.param_map_entry import ParamMapEntry
from isis_powder.routines.common import PARAM_MAPPING as COMMON_PARAM_MAPPING
from isis_powder.routines.common_enums import INPUT_BATCHING
diff --git a/scripts/Diffraction/isis_powder/routines/__init__.py b/scripts/Diffraction/isis_powder/routines/__init__.py
index 700e4f0d1ad..9fcc06f4b0b 100644
--- a/scripts/Diffraction/isis_powder/routines/__init__.py
+++ b/scripts/Diffraction/isis_powder/routines/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Disable unused import warnings. The import is for user convenience
# Currently these are the things from routines we want to expose to a public API
diff --git a/scripts/Diffraction/isis_powder/routines/absorb_corrections.py b/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
index 2bb2b5e86f4..eb8614f157c 100644
--- a/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
+++ b/scripts/Diffraction/isis_powder/routines/absorb_corrections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from isis_powder.routines import common, common_enums, sample_details
diff --git a/scripts/Diffraction/isis_powder/routines/calibrate.py b/scripts/Diffraction/isis_powder/routines/calibrate.py
index f2008529dc2..5bf66e1f556 100644
--- a/scripts/Diffraction/isis_powder/routines/calibrate.py
+++ b/scripts/Diffraction/isis_powder/routines/calibrate.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import isis_powder.routines.common as common
diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py
index b8956e879e5..2b4271450cc 100644
--- a/scripts/Diffraction/isis_powder/routines/common.py
+++ b/scripts/Diffraction/isis_powder/routines/common.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six import PY2, iterkeys
import collections
import warnings
diff --git a/scripts/Diffraction/isis_powder/routines/common_enums.py b/scripts/Diffraction/isis_powder/routines/common_enums.py
index cd55f4f46d3..59d657444be 100644
--- a/scripts/Diffraction/isis_powder/routines/common_enums.py
+++ b/scripts/Diffraction/isis_powder/routines/common_enums.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Holds enumeration classes for common values
diff --git a/scripts/Diffraction/isis_powder/routines/common_output.py b/scripts/Diffraction/isis_powder/routines/common_output.py
index 9d67c209581..b2425442790 100644
--- a/scripts/Diffraction/isis_powder/routines/common_output.py
+++ b/scripts/Diffraction/isis_powder/routines/common_output.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import os
diff --git a/scripts/Diffraction/isis_powder/routines/focus.py b/scripts/Diffraction/isis_powder/routines/focus.py
index ff2e7d48ecb..8880bc998e5 100644
--- a/scripts/Diffraction/isis_powder/routines/focus.py
+++ b/scripts/Diffraction/isis_powder/routines/focus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import WorkspaceGroup
import mantid.simpleapi as mantid
diff --git a/scripts/Diffraction/isis_powder/routines/instrument_settings.py b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
index 9e60fd3da8c..5203c0352ec 100644
--- a/scripts/Diffraction/isis_powder/routines/instrument_settings.py
+++ b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from six import iteritems
from isis_powder.routines import yaml_parser
import warnings
diff --git a/scripts/Diffraction/isis_powder/routines/param_map_entry.py b/scripts/Diffraction/isis_powder/routines/param_map_entry.py
index e260b0dd8da..4da9de368b1 100644
--- a/scripts/Diffraction/isis_powder/routines/param_map_entry.py
+++ b/scripts/Diffraction/isis_powder/routines/param_map_entry.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Holds an entry for a parameter map which will be later parsed by InstrumentSettings
diff --git a/scripts/Diffraction/isis_powder/routines/run_details.py b/scripts/Diffraction/isis_powder/routines/run_details.py
index 14aa89cb906..bbc45fa162d 100644
--- a/scripts/Diffraction/isis_powder/routines/run_details.py
+++ b/scripts/Diffraction/isis_powder/routines/run_details.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from isis_powder.routines import common, yaml_parser
import os
diff --git a/scripts/Diffraction/isis_powder/routines/sample_details.py b/scripts/Diffraction/isis_powder/routines/sample_details.py
index 0354c99d248..cf8168cdd23 100644
--- a/scripts/Diffraction/isis_powder/routines/sample_details.py
+++ b/scripts/Diffraction/isis_powder/routines/sample_details.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from six import iteritems
from isis_powder.routines import common
import math
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_parser.py b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
index 0b5489e0418..e97886594b0 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_parser.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import yaml
from isis_powder.routines import common as common
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
index 039e7e1a61a..2c225d34dd7 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
def calibration_file_sanity_check(yaml_dict, file_path):
# Check that the dictionary has data
if not yaml_dict:
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
index 06d8a50a690..2171a8de15a 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
index 711d3f2e3d7..cc8509c4b56 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid
from isis_powder.abstract_inst import AbstractInst
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
index 5021089160d..f275fbd63dc 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid # Have to import Mantid to setup paths
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
index c0f7e8baa93..a6036aec703 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as mantid
from isis_powder.routines import focus
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
index 52a8dc9198f..95a7dd7a3ae 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import FileFinder
import mantid.simpleapi as mantid # Have to import Mantid to setup paths
import unittest
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
index 8040524d061..929cacec3a3 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import warnings
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
index 67f1d579705..917785670cc 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.api
import os
import random
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index b04f02ed6ed..c018c934e2a 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import io
import six
import sys
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
index f9a3019d734..5f160ffa9ba 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import tempfile
import os
import unittest
diff --git a/scripts/Diffraction/wish/reduce.py b/scripts/Diffraction/wish/reduce.py
index d0b58a042bb..fe898d4fe78 100644
--- a/scripts/Diffraction/wish/reduce.py
+++ b/scripts/Diffraction/wish/reduce.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid import logger
import mantid.simpleapi as simple
import os
diff --git a/scripts/Engineering/EnggUtils.py b/scripts/Engineering/EnggUtils.py
index 6d5b752f773..370527dbb59 100644
--- a/scripts/Engineering/EnggUtils.py
+++ b/scripts/Engineering/EnggUtils.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import *
import mantid.simpleapi as mantid
diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py
index 933b4956628..d030a61dc49 100644
--- a/scripts/Engineering/EnginX.py
+++ b/scripts/Engineering/EnginX.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
import matplotlib.pyplot as plt
import numpy as np
diff --git a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
index 97157eaa5f9..6c71e427b75 100644
--- a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
+++ b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtWidgets
from .tabs.calibration.model import CalibrationModel
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
index ecfa06083ab..b9e2df13e27 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtCore import QSettings
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
index 24a641c2458..fb003562f72 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.settings.settings_helper import get_setting, set_setting
from Engineering.gui.engineering_diffraction.tabs.common import path_handling
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
index ef44ae60a5c..1a3f2075445 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from os import path
SETTINGS_DICT = {"save_location": str, "full_calibration": str, "recalc_vanadium": bool}
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py b/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
index 59b9bfa8ddd..d5c9b4e215d 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/settings_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
index f9d646c9d4e..0b162adde95 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.settings.settings_helper import set_setting, get_setting
from qtpy.QtCore import QSettings, QCoreApplication
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
index e7efc5d99e7..5b7c47b11f4 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat.mock import patch
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
index b60834f9309..950c16aa2d2 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
index 7226bcbeecc..99fdd691283 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path, makedirs
from matplotlib import gridspec
import matplotlib.pyplot as plt
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index c2f54461099..581c8ae078a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT, create_error_message
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
index c0be1f4250e..05a31800e29 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat.mock import patch
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index 909b6ba0f37..710f0019dbe 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat.mock import patch, MagicMock
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
index 09d685f039f..c9d71b8f34a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
index 4e2d57432e9..3c05d04b362 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class CalibrationInfo(object):
"""
Keeps track of the parameters that went into a calibration created by the engineering diffraction GUI.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
index 0f610f4e01a..2ad947119a4 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
ENGINX_MAX_SPECTRA = 2400 # 2512 spectra appear in the ws. But from testing, anything > 2400 doesn't work.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
index 478e9a69474..2dc31455dd8 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class CroppingPresenter(object):
def __init__(self, model, view):
self.model = model
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
index 9879c0e3391..adda044e651 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
index 5312ad202a5..21c9c35549a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_model import CroppingModel
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_view import CroppingView
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_presenter import CroppingPresenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
index e7c4a0a730c..5abba91be69 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from Engineering.gui.engineering_diffraction.tabs.common.cropping.cropping_model import CroppingModel
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
index 11cd00f1531..6fc52e4bfb0 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
index 07df2ef7e1a..97fdbd900fb 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/path_handling.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path
from mantid.kernel import logger
from mantid.simpleapi import Load
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
index 7feb1cca23b..605580fb2fe 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import tempfile
from shutil import rmtree
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
index 9526b520710..710bcb9dbea 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/vanadium_corrections.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from os import path
from os import makedirs
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
index a744c6995cc..7018f1bf99c 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
from os import path, makedirs
from matplotlib import gridspec
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
index 037145720d5..b4d8a8c8290 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT, create_error_message
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
from Engineering.gui.engineering_diffraction.tabs.common.vanadium_corrections import check_workspaces_exist
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
index d1177842727..2b3803e6ae5 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import tempfile
import shutil
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index e87f279d1b1..59f075397ea 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
index b9c89f23ca7..288d38fbfae 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtCore
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Engineering_Diffraction.py b/scripts/Engineering_Diffraction.py
index a3b4396c633..a23e7d83dc1 100644
--- a/scripts/Engineering_Diffraction.py
+++ b/scripts/Engineering_Diffraction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Engineering.gui.engineering_diffraction.engineering_diffraction import EngineeringDiffractionGui
from qtpy import QtCore
diff --git a/scripts/ErrorReporter/error_dialog_app.py b/scripts/ErrorReporter/error_dialog_app.py
index 97a136caff8..eac92f7ab60 100644
--- a/scripts/ErrorReporter/error_dialog_app.py
+++ b/scripts/ErrorReporter/error_dialog_app.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import argparse
import sys
diff --git a/scripts/ErrorReporter/error_report_presenter.py b/scripts/ErrorReporter/error_report_presenter.py
index 4033d680070..ad6630c4355 100644
--- a/scripts/ErrorReporter/error_report_presenter.py
+++ b/scripts/ErrorReporter/error_report_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import os
from mantid.kernel import ConfigService, ErrorReporter, Logger, UsageService
diff --git a/scripts/ErrorReporter/errorreport.py b/scripts/ErrorReporter/errorreport.py
index 4f588692b50..93d179e8335 100644
--- a/scripts/ErrorReporter/errorreport.py
+++ b/scripts/ErrorReporter/errorreport.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
import qtpy
if qtpy.PYQT5: # noqa
diff --git a/scripts/FilterEvents.py b/scripts/FilterEvents.py
index 0df797189a2..51421f005ce 100644
--- a/scripts/FilterEvents.py
+++ b/scripts/FilterEvents.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
set_matplotlib_backend() # must be called before anything tries to use matplotlib
diff --git a/scripts/FilterEvents/eventFilterGUI.py b/scripts/FilterEvents/eventFilterGUI.py
index 604453b9e0a..29651b34258 100644
--- a/scripts/FilterEvents/eventFilterGUI.py
+++ b/scripts/FilterEvents/eventFilterGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, too-many-lines, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import numpy
from qtpy.QtWidgets import (QFileDialog, QMainWindow, QMessageBox, QSlider, QVBoxLayout, QWidget) # noqa
diff --git a/scripts/Frequency_Domain_Analysis.py b/scripts/Frequency_Domain_Analysis.py
index 245dc491f0f..53228c87841 100644
--- a/scripts/Frequency_Domain_Analysis.py
+++ b/scripts/Frequency_Domain_Analysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.FrequencyDomainAnalysis.frequency_domain_analysis_2 import FrequencyAnalysisGui
from qtpy import QtCore
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/Frequency_Domain_Analysis_Old.py b/scripts/Frequency_Domain_Analysis_Old.py
index 2452d83cd7f..2bc1e89136c 100644
--- a/scripts/Frequency_Domain_Analysis_Old.py
+++ b/scripts/Frequency_Domain_Analysis_Old.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import sys
import PyQt4.QtGui as QtGui
diff --git a/scripts/HFIR_4Circle_Reduction.py b/scripts/HFIR_4Circle_Reduction.py
index 54da4b755ef..a026c136407 100644
--- a/scripts/HFIR_4Circle_Reduction.py
+++ b/scripts/HFIR_4Circle_Reduction.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
set_matplotlib_backend() # must be called before anything tries to use matplotlib
diff --git a/scripts/HFIR_4Circle_Reduction/FindUBUtility.py b/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
index 9591efb30b6..a9f995b25dd 100644
--- a/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
+++ b/scripts/HFIR_4Circle_Reduction/FindUBUtility.py
@@ -7,7 +7,6 @@
"""
Containing a set of classes used for finding (calculating and refining) UB matrix
"""
-from __future__ import (absolute_import, division, print_function)
import os
from . import guiutility
from qtpy.QtWidgets import (QDialog, QFileDialog) # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py b/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
index 298b8e9ceb6..bd4e7a65360 100644
--- a/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
+++ b/scripts/HFIR_4Circle_Reduction/IntegrateSingePtSubWindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103
-from __future__ import (absolute_import, division, print_function)
from HFIR_4Circle_Reduction.hfctables import SinglePtIntegrationTable
from HFIR_4Circle_Reduction.integratedpeakview import SinglePtIntegrationView
import HFIR_4Circle_Reduction.guiutility as guiutility
diff --git a/scripts/HFIR_4Circle_Reduction/NTableWidget.py b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
index b595cadfa9b..07dfe83d330 100644
--- a/scripts/HFIR_4Circle_Reduction/NTableWidget.py
+++ b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,R0904
# N(DAV)TableWidget
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import csv
from qtpy.QtWidgets import (QCheckBox, QTableWidget, QTableWidgetItem) # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py b/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
index fb817582275..ab129168f40 100644
--- a/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
+++ b/scripts/HFIR_4Circle_Reduction/PeaksIntegrationReport.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from qtpy.QtWidgets import (QDialog, QFileDialog) # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/absorption.py b/scripts/HFIR_4Circle_Reduction/absorption.py
index e7c5dc13c03..09a03bdec65 100644
--- a/scripts/HFIR_4Circle_Reduction/absorption.py
+++ b/scripts/HFIR_4Circle_Reduction/absorption.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0913,W0403,R0903,C0103
-from __future__ import (absolute_import, division, print_function)
import HFIR_4Circle_Reduction.fourcircle_utility as util4
import math
from mantid.api import AnalysisDataService
diff --git a/scripts/HFIR_4Circle_Reduction/detector2dview.py b/scripts/HFIR_4Circle_Reduction/detector2dview.py
index 37baa6b3f90..6de56654864 100644
--- a/scripts/HFIR_4Circle_Reduction/detector2dview.py
+++ b/scripts/HFIR_4Circle_Reduction/detector2dview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0902,R0903,R0904,W0212
-from __future__ import (absolute_import, division, print_function)
from HFIR_4Circle_Reduction import mpl2dgraphicsview
import numpy as np
import os
diff --git a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
index 8ea88badeba..338227d91e1 100644
--- a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0633,R0913,too-many-branches
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import csv
import os
diff --git a/scripts/HFIR_4Circle_Reduction/fputility.py b/scripts/HFIR_4Circle_Reduction/fputility.py
index 37ad2c9a980..a57d8906fbb 100644
--- a/scripts/HFIR_4Circle_Reduction/fputility.py
+++ b/scripts/HFIR_4Circle_Reduction/fputility.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0914,R0912,R0913
# Utility methods for Fullprof
-from __future__ import (absolute_import, division, print_function)
import os
import math
diff --git a/scripts/HFIR_4Circle_Reduction/guiutility.py b/scripts/HFIR_4Circle_Reduction/guiutility.py
index 6e78c1c31c4..4839b37da8d 100644
--- a/scripts/HFIR_4Circle_Reduction/guiutility.py
+++ b/scripts/HFIR_4Circle_Reduction/guiutility.py
@@ -7,7 +7,6 @@
#
# GUI Utility Methods
#
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import math
import numpy
diff --git a/scripts/HFIR_4Circle_Reduction/hfctables.py b/scripts/HFIR_4Circle_Reduction/hfctables.py
index 2903c2cc580..d34833f29a6 100644
--- a/scripts/HFIR_4Circle_Reduction/hfctables.py
+++ b/scripts/HFIR_4Circle_Reduction/hfctables.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,C0103,R0901,R0904,R0913,C0302
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import numpy
import sys
diff --git a/scripts/HFIR_4Circle_Reduction/integratedpeakview.py b/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
index 88d4db885bb..a30b982585b 100644
--- a/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
+++ b/scripts/HFIR_4Circle_Reduction/integratedpeakview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0904,R0903
-from __future__ import (absolute_import, division, print_function)
import numpy
from HFIR_4Circle_Reduction import mplgraphicsview
diff --git a/scripts/HFIR_4Circle_Reduction/message_dialog.py b/scripts/HFIR_4Circle_Reduction/message_dialog.py
index 5bd120966b0..2dc0f02ffcd 100644
--- a/scripts/HFIR_4Circle_Reduction/message_dialog.py
+++ b/scripts/HFIR_4Circle_Reduction/message_dialog.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Dialog for message
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
diff --git a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
index 35999dd59c1..9b94c4d6cb6 100644
--- a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,non-parent-init-called,R0901,R0902,too-many-branches,C0302
-from __future__ import (absolute_import, division, print_function)
import os
import numpy as np
from qtpy.QtWidgets import (QWidget, QVBoxLayout, QSizePolicy)
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
index 07ad0787b8e..351744e14df 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,non-parent-init-called,R0902,too-many-branches,C0302
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import os
import numpy as np
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
index 90633c55ae2..cbeb6f4fe9e 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0901,R0902,R0904
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import numpy as np
import os
diff --git a/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py b/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
index 9ef97de5f18..c96ecef7c1e 100644
--- a/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
+++ b/scripts/HFIR_4Circle_Reduction/multi_threads_helpers.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0913,R0902
-from __future__ import (absolute_import, division, print_function)
import os
from qtpy.QtCore import Signal as pyqtSignal
from qtpy.QtCore import QThread # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py b/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
index 358c8e91ef3..4823c7cd519 100644
--- a/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
+++ b/scripts/HFIR_4Circle_Reduction/optimizelatticewindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QMainWindow)
from qtpy.QtCore import Signal as pyqtSignal
from mantid.kernel import Logger
diff --git a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
index b9d13c6802e..346bcd63861 100644
--- a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Utility methods to do peak integration
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import numpy
import math
diff --git a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
index ae0e5bbeb5a..fa9ef655932 100644
--- a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
+++ b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0902
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import numpy
import time
diff --git a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
index a88c9bd0a18..217c97d07b0 100644
--- a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
+++ b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,W0403
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import sys
import numpy as np
diff --git a/scripts/HFIR_4Circle_Reduction/project_manager.py b/scripts/HFIR_4Circle_Reduction/project_manager.py
index 6c0f9f5425d..50a3bc6c916 100644
--- a/scripts/HFIR_4Circle_Reduction/project_manager.py
+++ b/scripts/HFIR_4Circle_Reduction/project_manager.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.simpleapi as mantidsimple
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
index 054bd6c2cf3..4e5f547686e 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
@@ -14,7 +14,6 @@
# - Download from internet to cache (download-mode)
#
################################################################################
-from __future__ import (absolute_import, division, print_function)
import bisect
try:
# python3
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
index 5eadb8771e6..8cada0a54ca 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
@@ -10,7 +10,6 @@
# MainWindow application for reducing HFIR 4-circle
#
################################################################################
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import six
import os
diff --git a/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py b/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
index 43ce8a56264..adc0f3c9e3b 100644
--- a/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
+++ b/scripts/HFIR_4Circle_Reduction/refineubfftsetup.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/HFIR_4Circle_Reduction/viewspicedialog.py b/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
index d169d0b6501..e7f47610f6e 100644
--- a/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
+++ b/scripts/HFIR_4Circle_Reduction/viewspicedialog.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/Inelastic/CrystalField/__init__.py b/scripts/Inelastic/CrystalField/__init__.py
index d057ea94508..a8ed4a58910 100644
--- a/scripts/Inelastic/CrystalField/__init__.py
+++ b/scripts/Inelastic/CrystalField/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .fitting import CrystalField, CrystalFieldFit
from .function import PeaksFunction, Background, Function, ResolutionModel, PhysicalProperties
from .pointcharge import PointCharge
diff --git a/scripts/Inelastic/CrystalField/energies.py b/scripts/Inelastic/CrystalField/energies.py
index 9cc270c3b8c..ac979e1ac19 100644
--- a/scripts/Inelastic/CrystalField/energies.py
+++ b/scripts/Inelastic/CrystalField/energies.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-name-in-module
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import CrystalFieldEnergies
import numpy as np
import warnings
diff --git a/scripts/Inelastic/CrystalField/fitting.py b/scripts/Inelastic/CrystalField/fitting.py
index 586e7189746..f7e627cfa56 100644
--- a/scripts/Inelastic/CrystalField/fitting.py
+++ b/scripts/Inelastic/CrystalField/fitting.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import re
import warnings
diff --git a/scripts/Inelastic/CrystalField/function.py b/scripts/Inelastic/CrystalField/function.py
index 9a9b0dfd410..79833231af2 100644
--- a/scripts/Inelastic/CrystalField/function.py
+++ b/scripts/Inelastic/CrystalField/function.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
from six import string_types
diff --git a/scripts/Inelastic/CrystalField/normalisation.py b/scripts/Inelastic/CrystalField/normalisation.py
index b1e8842b357..8c7603d168a 100644
--- a/scripts/Inelastic/CrystalField/normalisation.py
+++ b/scripts/Inelastic/CrystalField/normalisation.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from CrystalField.energies import energies as CFEnergy
from CrystalField.fitting import ionname2Nre
diff --git a/scripts/Inelastic/CrystalField/pointcharge.py b/scripts/Inelastic/CrystalField/pointcharge.py
index 4ad0b5fc4e6..8d824fdb5bc 100644
--- a/scripts/Inelastic/CrystalField/pointcharge.py
+++ b/scripts/Inelastic/CrystalField/pointcharge.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from six import string_types
from scipy import constants
diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py
index 37dbcc12910..9cb8795a842 100644
--- a/scripts/Inelastic/Direct/AbsorptionShapes.py
+++ b/scripts/Inelastic/Direct/AbsorptionShapes.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from six import string_types
from mantid.kernel import funcinspect
from mantid.simpleapi import *
diff --git a/scripts/Inelastic/Direct/CommonFunctions.py b/scripts/Inelastic/Direct/CommonFunctions.py
index a4c5afb4be0..c60338a495b 100644
--- a/scripts/Inelastic/Direct/CommonFunctions.py
+++ b/scripts/Inelastic/Direct/CommonFunctions.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import sys
# See https://www.python.org/dev/peps/pep-0479/#abstract and
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index c92e4a9f14d..0b3efda17ad 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -7,7 +7,6 @@
#pylint: disable=too-many-lines
#pylint: disable=invalid-name
#pylind: disable=attribute-defined-outside-init
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from mantid.simpleapi import *
from mantid.kernel import funcinspect
from mantid import geometry,api
diff --git a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
index 2c42ca646a1..6af0bc114e1 100644
--- a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
+++ b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
import platform
diff --git a/scripts/Inelastic/Direct/NonIDF_Properties.py b/scripts/Inelastic/Direct/NonIDF_Properties.py
index 95410d6d1e6..c84bd78d2d6 100644
--- a/scripts/Inelastic/Direct/NonIDF_Properties.py
+++ b/scripts/Inelastic/Direct/NonIDF_Properties.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from six import string_types
from Direct.PropertiesDescriptors import *
from Direct.RunDescriptor import RunDescriptor,RunDescriptorDependent
diff --git a/scripts/Inelastic/Direct/PropertiesDescriptors.py b/scripts/Inelastic/Direct/PropertiesDescriptors.py
index 4babec380fe..91bb40d0ecc 100644
--- a/scripts/Inelastic/Direct/PropertiesDescriptors.py
+++ b/scripts/Inelastic/Direct/PropertiesDescriptors.py
@@ -9,7 +9,6 @@
""" File contains collection of Descriptors used to define complex
properties in NonIDF_Properties and PropertyManager classes
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import numpy as np
import math
diff --git a/scripts/Inelastic/Direct/PropertyManager.py b/scripts/Inelastic/Direct/PropertyManager.py
index 415525d66d3..46e19fb9ca8 100644
--- a/scripts/Inelastic/Direct/PropertyManager.py
+++ b/scripts/Inelastic/Direct/PropertyManager.py
@@ -8,7 +8,6 @@
# Mantid Repository : https://github.com/mantidproject/mantid
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from Direct.NonIDF_Properties import *
from collections import OrderedDict, Iterable
diff --git a/scripts/Inelastic/Direct/ReductionHelpers.py b/scripts/Inelastic/Direct/ReductionHelpers.py
index d6a7ffb5098..14f346b26b5 100644
--- a/scripts/Inelastic/Direct/ReductionHelpers.py
+++ b/scripts/Inelastic/Direct/ReductionHelpers.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from six import string_types
from mantid import config
import os
diff --git a/scripts/Inelastic/Direct/ReductionWrapper.py b/scripts/Inelastic/Direct/ReductionWrapper.py
index 6963c797ba2..17517e6fdc0 100644
--- a/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from mantid.simpleapi import *
from mantid import config, api
from mantid.kernel import funcinspect
diff --git a/scripts/Inelastic/Direct/RunDescriptor.py b/scripts/Inelastic/Direct/RunDescriptor.py
index c9451c23e66..67bf822de8f 100644
--- a/scripts/Inelastic/Direct/RunDescriptor.py
+++ b/scripts/Inelastic/Direct/RunDescriptor.py
@@ -9,7 +9,6 @@
#pylint: disable=attribute-defined-outside-init
""" File contains Descriptors used describe run for direct inelastic reduction """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from six import string_types
from mantid.simpleapi import *
from mantid.kernel import funcinspect
diff --git a/scripts/Inelastic/Direct/dgreduce.py b/scripts/Inelastic/Direct/dgreduce.py
index 52911c53a3b..95c32d070c3 100644
--- a/scripts/Inelastic/Direct/dgreduce.py
+++ b/scripts/Inelastic/Direct/dgreduce.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
""" Empty class temporary left for compatibility with previous interfaces """
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import Direct.DirectEnergyConversion as DRC
from mantid.simpleapi import *
from mantid.kernel import funcinspect
diff --git a/scripts/Inelastic/Direct/diagnostics.py b/scripts/Inelastic/Direct/diagnostics.py
index 0c0cb79d94b..258c27f68b0 100644
--- a/scripts/Inelastic/Direct/diagnostics.py
+++ b/scripts/Inelastic/Direct/diagnostics.py
@@ -17,7 +17,6 @@ The output of each function is a workspace containing a single bin where:
This workspace can be summed with other masked workspaces to accumulate
masking and also passed to MaskDetectors to match masking there.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
from six import string_types
from mantid.simpleapi import *
from mantid.kernel.funcinspect import lhs_info
diff --git a/scripts/Inelastic/IndirectBayes.py b/scripts/Inelastic/IndirectBayes.py
index 1525e9b13fb..0936593c1e2 100644
--- a/scripts/Inelastic/IndirectBayes.py
+++ b/scripts/Inelastic/IndirectBayes.py
@@ -13,7 +13,6 @@ Input : the Python list is padded to Fortrans length using procedure PadArray
Output : the Fortran numpy array is sliced to Python length using dataY = yout[:ny]
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
if is_supported_f2py_platform(): # noqa
QLr = import_f2py("QLres")
diff --git a/scripts/Inelastic/IndirectCommon.py b/scripts/Inelastic/IndirectCommon.py
index ac2384eabab..8f680f9a46b 100644
--- a/scripts/Inelastic/IndirectCommon.py
+++ b/scripts/Inelastic/IndirectCommon.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import mantid.simpleapi as s_api
diff --git a/scripts/Inelastic/IndirectImport.py b/scripts/Inelastic/IndirectImport.py
index a1570644015..c50699be1f7 100644
--- a/scripts/Inelastic/IndirectImport.py
+++ b/scripts/Inelastic/IndirectImport.py
@@ -10,8 +10,6 @@ the Indirect scripts depending on platform and numpy package version.
We also deal with importing the mantidplot module outside of MantidPlot here.
"""
-from __future__ import (absolute_import, division, print_function)
-
from contextlib import contextmanager
import numpy.core.setup_common as numpy_cfg
import os
diff --git a/scripts/Inelastic/IndirectMuscat.py b/scripts/Inelastic/IndirectMuscat.py
index 88dff9a7077..9b74728daab 100644
--- a/scripts/Inelastic/IndirectMuscat.py
+++ b/scripts/Inelastic/IndirectMuscat.py
@@ -10,7 +10,6 @@
MUSIC : Version of Minus for MIDAS
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
if is_supported_f2py_platform(): # noqa
muscat = import_f2py("muscat")
diff --git a/scripts/Inelastic/IndirectNeutron.py b/scripts/Inelastic/IndirectNeutron.py
index 0cd0a744b17..754cb8600f6 100644
--- a/scripts/Inelastic/IndirectNeutron.py
+++ b/scripts/Inelastic/IndirectNeutron.py
@@ -10,7 +10,6 @@
Force for ILL backscattering raw
"""
-from __future__ import (absolute_import, division, print_function)
from IndirectImport import *
from mantid.simpleapi import *
from mantid import config, logger, mtd, FileFinder
diff --git a/scripts/Inelastic/IndirectReductionCommon.py b/scripts/Inelastic/IndirectReductionCommon.py
index b8fbc3e6124..228c84f8674 100644
--- a/scripts/Inelastic/IndirectReductionCommon.py
+++ b/scripts/Inelastic/IndirectReductionCommon.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import DeleteWorkspace, Load
from mantid.api import AnalysisDataService, WorkspaceGroup, AlgorithmManager
from mantid import mtd, logger, config
diff --git a/scripts/Inelastic/dos/load_castep.py b/scripts/Inelastic/dos/load_castep.py
index 4ad003730ec..6b147775b13 100644
--- a/scripts/Inelastic/dos/load_castep.py
+++ b/scripts/Inelastic/dos/load_castep.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import re
diff --git a/scripts/Inelastic/dos/load_phonon.py b/scripts/Inelastic/dos/load_phonon.py
index a3893aec225..5d461330728 100644
--- a/scripts/Inelastic/dos/load_phonon.py
+++ b/scripts/Inelastic/dos/load_phonon.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import re
diff --git a/scripts/Inelastic/vesuvio/backgrounds.py b/scripts/Inelastic/vesuvio/backgrounds.py
index d612de57e1b..fb2c017b1c2 100644
--- a/scripts/Inelastic/vesuvio/backgrounds.py
+++ b/scripts/Inelastic/vesuvio/backgrounds.py
@@ -7,7 +7,6 @@
# pylint: disable=too-few-public-methods,redefined-builtin
"""Holds classes that define the backgrounds for fitting
"""
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
import ast
diff --git a/scripts/Inelastic/vesuvio/base.py b/scripts/Inelastic/vesuvio/base.py
index 07673ece9ce..77569b78fe6 100644
--- a/scripts/Inelastic/vesuvio/base.py
+++ b/scripts/Inelastic/vesuvio/base.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-few-public-methods,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
from mantid.api import Algorithm
diff --git a/scripts/Inelastic/vesuvio/commands.py b/scripts/Inelastic/vesuvio/commands.py
index 9c80a35556b..8286411201a 100644
--- a/scripts/Inelastic/vesuvio/commands.py
+++ b/scripts/Inelastic/vesuvio/commands.py
@@ -9,8 +9,6 @@
Defines functions and classes to start the processing of Vesuvio data.
The main entry point that most users should care about is fit_tof().
"""
-from __future__ import (absolute_import, division, print_function)
-
import re
import numpy as np
from functools import reduce
diff --git a/scripts/Inelastic/vesuvio/profiles.py b/scripts/Inelastic/vesuvio/profiles.py
index 056b12d0cbd..47df8a1b978 100644
--- a/scripts/Inelastic/vesuvio/profiles.py
+++ b/scripts/Inelastic/vesuvio/profiles.py
@@ -9,7 +9,6 @@
This is all essentially about parsing the user input and putting it into a form
the Mantid fitting algorithm will understand
"""
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
import ast
diff --git a/scripts/Interface/compile_pd_ui.py b/scripts/Interface/compile_pd_ui.py
index b66c2859ea5..66348f5983b 100755
--- a/scripts/Interface/compile_pd_ui.py
+++ b/scripts/Interface/compile_pd_ui.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from compile_util import compile_ui
# Compile resource files for Diffraction instruments
diff --git a/scripts/Interface/compile_util_ui.py b/scripts/Interface/compile_util_ui.py
index 5080f47ed46..5bbdaca58b5 100644
--- a/scripts/Interface/compile_util_ui.py
+++ b/scripts/Interface/compile_util_ui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
diff --git a/scripts/Interface/reduction_application.py b/scripts/Interface/reduction_application.py
index e78c9e15d9c..568f51a9558 100644
--- a/scripts/Interface/reduction_application.py
+++ b/scripts/Interface/reduction_application.py
@@ -8,7 +8,6 @@
"""
Main window for reduction UIs
"""
-from __future__ import (absolute_import, division, print_function)
import six
import sys
import os
diff --git a/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py b/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
index 2358a567156..ee73393ce05 100644
--- a/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/dgs_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.inelastic.dgs_sample_setup import SampleSetupWidget
from reduction_gui.widgets.inelastic.dgs_data_corrections import DataCorrectionsWidget
diff --git a/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py b/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
index 525913ceab6..6d7f267de44 100644
--- a/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.diffraction.diffraction_run_setup import RunSetupWidget
from reduction_gui.widgets.diffraction.diffraction_adv_setup import AdvancedSetupWidget
diff --git a/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py b/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
index fd52fe62f9a..0246724cbfd 100644
--- a/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/eqsans_interface_dev.py
@@ -10,7 +10,6 @@
The actual view/layout is define in .ui files. The state of the reduction
process is kept elsewhere (SNSReduction object)
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.widgets.sans.hfir_detector import DetectorWidget
from reduction_gui.widgets.sans.eqsans_instrument import SANSInstrumentWidget
diff --git a/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py b/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
index 32a101d23a4..ba61da55496 100644
--- a/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/hfir_interface_dev.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
This module defines the interface control for HFIR SANS.
Each reduction method tab that needs to be presented is defined here.
diff --git a/scripts/Interface/reduction_gui/instruments/instrument_factory.py b/scripts/Interface/reduction_gui/instruments/instrument_factory.py
index fb2eb86cb0a..4f0f722c24e 100644
--- a/scripts/Interface/reduction_gui/instruments/instrument_factory.py
+++ b/scripts/Interface/reduction_gui/instruments/instrument_factory.py
@@ -9,7 +9,6 @@
This module is responsible for the association between an instrument name
and its corresponding interface class.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.hfir_interface_dev import HFIRInterface
from reduction_gui.instruments.eqsans_interface_dev import EQSANSInterface
from reduction_gui.instruments.dgs_interface_dev import DgsInterface
diff --git a/scripts/Interface/reduction_gui/instruments/interface.py b/scripts/Interface/reduction_gui/instruments/interface.py
index e994d52cd3c..665ef77cf3a 100644
--- a/scripts/Interface/reduction_gui/instruments/interface.py
+++ b/scripts/Interface/reduction_gui/instruments/interface.py
@@ -8,7 +8,6 @@
"""
Base class for instrument-specific user interface
"""
-from __future__ import (absolute_import, division, print_function)
import six
from qtpy.QtWidgets import (QMessageBox) # noqa
import sys
diff --git a/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py b/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
index 23670d06739..4ac651b6b77 100644
--- a/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
+++ b/scripts/Interface/reduction_gui/instruments/toftof_interface_dev.py
@@ -8,7 +8,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.instruments.interface import InstrumentInterface
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
index a5964d1f0b2..ec9c64d1ac6 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
index f1df36ce97c..701325672c4 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_filter_setup_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
index a9b80cbb5ba..1bc9e6eb4e7 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name,R0912
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
index df7ed4ee6eb..f097e710222 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_run_setup_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
Classes for each reduction step. Those are kept separately
from the the interface class so that the DgsReduction class could
diff --git a/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py b/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
index 97dbf3c7a34..b87e9877b72 100644
--- a/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/eqsans_reduction.py
@@ -9,7 +9,6 @@
This class holds all the necessary information to create a reduction script.
This is a fake version of the Reducer for testing purposes.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import os
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/hfir_reduction.py b/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
index d723c3ff33e..1e80d8c5d3a 100644
--- a/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/hfir_reduction.py
@@ -9,7 +9,6 @@
This class holds all the necessary information to create a reduction script.
This is a fake version of the Reducer for testing purposes.
"""
-from __future__ import (absolute_import, division, print_function)
import time
import os
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
index edd03ec03d3..3630595d280 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
index 4050a932815..ad623d18cb7 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_data_corrections_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
index 428114e49b8..078bf1bc043 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_diagnose_detectors_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Classes for each reduction step. Those are kept separately
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
index 8cd8bc48d9c..62e23c861bc 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_pd_sc_conversion_script.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
"""
Classes for each reduction step. Those are kept separately
from the the interface class so that the DgsReduction class could
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
index 977b2432a6c..7072cfcc3f9 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_reduction_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import time
import mantid
from reduction_gui.reduction.scripter import BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
index a7ab34d275a..6937d7a1d80 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the DgsReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import os
import xml.dom.minidom
diff --git a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
index 261bdb8adb8..b04dfa37469 100644
--- a/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
+++ b/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
IS_IN_MANTIDPLOT = False
diff --git a/scripts/Interface/reduction_gui/reduction/output_script.py b/scripts/Interface/reduction_gui/reduction/output_script.py
index 79a2acd8147..83be0261dd1 100644
--- a/scripts/Interface/reduction_gui/reduction/output_script.py
+++ b/scripts/Interface/reduction_gui/reduction/output_script.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
index d516fb9052b..831dc0f6029 100644
--- a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
+++ b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
@@ -8,7 +8,6 @@
Legacy class that old LR reduction options.
This is still in use for backward compatibility.
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
index 4a30c132c16..8b6a9100753 100644
--- a/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
+++ b/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_series.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.reflectometer.refl_data_script import DataSets as REFLDataSets
diff --git a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py b/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
index c263d134344..145e587d9f2 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/data_cat.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name
"""
Simple local data catalog for Mantid
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
index f35f4108f43..47ec6bfafab 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_background_script.py
@@ -7,7 +7,6 @@
"""
Sample data options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_background_script import Background as BaseBackground
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
index c317d3d13e2..8d1507a6022 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_catalog.py
@@ -8,7 +8,6 @@
"""
Data catalog for EQSANS
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.data_cat import DataCatalog as BaseCatalog
from reduction_gui.reduction.sans.data_cat import DataSet, DataType
from reduction_gui.reduction.scripter import execute_script
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
index 9610941352d..649cfe2aab6 100755
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_proxy.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import sys
# Check whether Mantid is available
try:
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
index e7ff9ded46a..511f860ff1e 100755
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_data_script.py
@@ -7,7 +7,6 @@
"""
Data set options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.eqsans_sample_script import SampleData as BaseSampleData
from reduction_gui.reduction.sans.eqsans_background_script import Background
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
index e1f39bcd0be..da2b489341e 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_options_script.py
@@ -7,7 +7,6 @@
"""
General options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_options_script import ReductionOptions as BaseOptions
diff --git a/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py b/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
index 5d96f9287c0..6d4f2aa65e9 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/eqsans_sample_script.py
@@ -7,7 +7,6 @@
"""
Sample data options for EQSANS reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_sample_script import SampleData as BaseSampleData
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
index 1737a127937..672f1d55d1e 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
from reduction_gui.reduction.sans.hfir_sample_script import SampleData
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
index a85ee36d6e5..063f90503b2 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_catalog.py
@@ -8,7 +8,6 @@
"""
Data catalog for HFIR SANS
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_gui.reduction.sans.data_cat import DataCatalog as BaseCatalog
from reduction_gui.reduction.sans.data_cat import DataSet, DataType
from reduction_gui.reduction.scripter import execute_script
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
index 5ad9d011421..1f43b16baed 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_data_proxy.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=bare-except,invalid-name
-from __future__ import (absolute_import, division, print_function)
import sys
# Check whether Mantid is available
try:
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
index 67faea2a708..2e7690f15b0 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py
@@ -8,7 +8,6 @@
"""
Detector options for reduction
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
index 00518a88742..b43e39348bf 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_options_script.py
@@ -9,7 +9,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import inspect
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py b/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
index 4f88ddba092..bb779bb939d 100644
--- a/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
+++ b/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py
@@ -10,7 +10,6 @@
from the the interface class so that the HFIRReduction class could
be used independently of the interface implementation
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
import os
from reduction_gui.reduction.scripter import BaseScriptElement
diff --git a/scripts/Interface/reduction_gui/reduction/scripter.py b/scripts/Interface/reduction_gui/reduction/scripter.py
index 6039660efa7..a3fadcd4ab0 100644
--- a/scripts/Interface/reduction_gui/reduction/scripter.py
+++ b/scripts/Interface/reduction_gui/reduction/scripter.py
@@ -9,7 +9,6 @@
Reduction scripter used to take reduction parameters
end produce a Mantid reduction script
"""
-from __future__ import (absolute_import, division, print_function)
import xml.dom.minidom
import sys
import time
diff --git a/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py b/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
index a2074aad79c..cb9677c1ace 100644
--- a/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
+++ b/scripts/Interface/reduction_gui/reduction/toftof/toftof_reduction.py
@@ -11,8 +11,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
-
from itertools import repeat, compress
import xml.dom.minidom
from reduction_gui.reduction.scripter import BaseScriptElement, BaseReductionScripter
diff --git a/scripts/Interface/reduction_gui/settings/application_settings.py b/scripts/Interface/reduction_gui/settings/application_settings.py
index 132776196d8..2d76248b1b7 100644
--- a/scripts/Interface/reduction_gui/settings/application_settings.py
+++ b/scripts/Interface/reduction_gui/settings/application_settings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import six
'''
Notes:
diff --git a/scripts/Interface/reduction_gui/widgets/base_widget.py b/scripts/Interface/reduction_gui/widgets/base_widget.py
index b2fbdc51400..90ef8ffe128 100644
--- a/scripts/Interface/reduction_gui/widgets/base_widget.py
+++ b/scripts/Interface/reduction_gui/widgets/base_widget.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (QFileInfo) # noqa
from qtpy.QtWidgets import (QFileDialog, QHBoxLayout, QMessageBox, QWidget) # noqa
import os
diff --git a/scripts/Interface/reduction_gui/widgets/data_table_view.py b/scripts/Interface/reduction_gui/widgets/data_table_view.py
index 210324521dd..8576f20a362 100644
--- a/scripts/Interface/reduction_gui/widgets/data_table_view.py
+++ b/scripts/Interface/reduction_gui/widgets/data_table_view.py
@@ -7,7 +7,6 @@
"""
DataTable Widget for data runs.
"""
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtCore, QtWidgets
from qtpy.QtCore import Qt
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
index cb265ea77ac..975db7e3435 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
@@ -8,7 +8,6 @@
################################################################################
# Advanced Setup Widget
################################################################################
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
index 477bd26d3ff..87eb676284a 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_filter_setup.py
@@ -8,7 +8,6 @@
################################################################################
# Event Filtering (and advanced) Setup Widget
################################################################################
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Logger
from mantid.simpleapi import ExportTimeSeriesLog, Load
import matplotlib.pyplot as plt
diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
index 041831c9ea8..dc1d5bd5441 100644
--- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_run_setup.py
@@ -8,7 +8,6 @@
################################################################################
# This is my first attempt to make a tab from quasi-scratch
################################################################################
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QDialog, QFrame) # noqa
from qtpy.QtCore import (QRegExp) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator, QRegExpValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
index a074a5447a4..4f541d027a6 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
index 8bea8f914e6..b5611a83685 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_data_corrections.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QButtonGroup, QFrame) # noqa
from qtpy.QtGui import (QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
index c9eece0d229..6cd25d23dba 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_diagnose_detectors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
index fbf4c78685b..ef3839c7000 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_pd_sc_conversion.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui, QtCore
from functools import partial
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
index 36960a056c6..fa0a0f63f9c 100644
--- a/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFileDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
from functools import partial
diff --git a/scripts/Interface/reduction_gui/widgets/output.py b/scripts/Interface/reduction_gui/widgets/output.py
index 66c8047e38e..41d33364385 100644
--- a/scripts/Interface/reduction_gui/widgets/output.py
+++ b/scripts/Interface/reduction_gui/widgets/output.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from reduction_gui.reduction.output_script import Output
from reduction_gui.widgets.base_widget import BaseWidget
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
index 1b55535ade5..a9724c2dc1d 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import six
from qtpy.QtWidgets import (QButtonGroup, QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
index 3442e3e408e..2bba7476345 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import six
from qtpy.QtWidgets import (QButtonGroup, QDialog, QFileDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
index 17d7b84bbc4..0fddcdd9bf6 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_background.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import reduction_gui.widgets.util as util
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
index 1e830ca44e2..69afaf9fb63 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import six
from qtpy.QtWidgets import (QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
index a67123b12b5..323e482bb88 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
import six
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
index 5451b7465b4..2d06a5dac03 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,protected-access
-from __future__ import (absolute_import, division, print_function)
import six
import os
from qtpy.QtWidgets import (QFrame, QGroupBox, QMessageBox) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py b/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
index 29eedfc74d4..a8aaa60f576 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/sans_catalog.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (Qt) # noqa
from qtpy.QtWidgets import (QAction, QApplication, QFileDialog, QFrame, QMenu, QTableWidgetItem) # noqa
from reduction_gui.settings.application_settings import GeneralSettings
diff --git a/scripts/Interface/reduction_gui/widgets/sans/stitcher.py b/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
index 08cd4e7d0dc..6976a3484f0 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name, protected-access, super-on-old-class
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui, QtCore
import os
from reduction_gui.settings.application_settings import GeneralSettings
diff --git a/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py b/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
index 19c2d3789d7..a55ae810d25 100644
--- a/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
+++ b/scripts/Interface/reduction_gui/widgets/toftof/toftof_setup.py
@@ -10,7 +10,6 @@
"""
TOFTOF reduction workflow gui.
"""
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtCore import (Qt) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
from qtpy.QtWidgets import (QButtonGroup, QCheckBox, QDoubleSpinBox, QFileDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLayout, QLineEdit, QPushButton, QRadioButton, QSizePolicy, QSpacerItem, QWidget, QVBoxLayout) # noqa
diff --git a/scripts/Interface/reduction_gui/widgets/util.py b/scripts/Interface/reduction_gui/widgets/util.py
index 87ee5981faa..3d75d27f6ec 100644
--- a/scripts/Interface/reduction_gui/widgets/util.py
+++ b/scripts/Interface/reduction_gui/widgets/util.py
@@ -7,7 +7,6 @@
"""
Utility functions used be the widgets
"""
-from __future__ import (absolute_import, division, print_function)
CSS_VALID = """QLineEdit {
background-color: white;
}"""
diff --git a/scripts/Interface/ui/batchwidget/batch_widget_gui.py b/scripts/Interface/ui/batchwidget/batch_widget_gui.py
index fd45f28e0c3..54a9c9692e0 100644
--- a/scripts/Interface/ui/batchwidget/batch_widget_gui.py
+++ b/scripts/Interface/ui/batchwidget/batch_widget_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui
from mantidqtpython import MantidQt
from ui.batchwidget.ui_batch_widget_window import Ui_BatchWidgetWindow
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 540f318b59b..f85e59ea1fe 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtGui
from mantidqtpython import MantidQt
from ui.dataprocessorinterface.ui_data_processor_window import Ui_DataProcessorWindow
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 6ad2af48f06..02bc95db6f1 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
try:
from mantidplot import *
except ImportError:
diff --git a/scripts/Interface/ui/sans_isis/beam_centre.py b/scripts/Interface/ui/sans_isis/beam_centre.py
index f3d257b2dc5..c755d4f1aa3 100644
--- a/scripts/Interface/ui/sans_isis/beam_centre.py
+++ b/scripts/Interface/ui/sans_isis/beam_centre.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtGui, QtCore, QtWidgets
from six import with_metaclass
diff --git a/scripts/Interface/ui/sans_isis/diagnostics_page.py b/scripts/Interface/ui/sans_isis/diagnostics_page.py
index 57a463bf875..70ba24c8942 100644
--- a/scripts/Interface/ui/sans_isis/diagnostics_page.py
+++ b/scripts/Interface/ui/sans_isis/diagnostics_page.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtCore, QtWidgets
diff --git a/scripts/Interface/ui/sans_isis/masking_table.py b/scripts/Interface/ui/sans_isis/masking_table.py
index 893c357c37c..fd111261fca 100644
--- a/scripts/Interface/ui/sans_isis/masking_table.py
+++ b/scripts/Interface/ui/sans_isis/masking_table.py
@@ -10,8 +10,6 @@ The view for the masking table displays all available masks for a SANS reduction
and masked SANS workspace.
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy import QtWidgets
from six import with_metaclass
diff --git a/scripts/Interface/ui/sans_isis/run_selector_widget.py b/scripts/Interface/ui/sans_isis/run_selector_widget.py
index daf7f0dbfe1..c532514a720 100644
--- a/scripts/Interface/ui/sans_isis/run_selector_widget.py
+++ b/scripts/Interface/ui/sans_isis/run_selector_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtGui, QtWidgets
from qtpy.QtCore import Signal, QSettings, QFileInfo
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index 19d1d483fbf..cd2daf64b76 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -8,8 +8,6 @@
""" Main view for the ISIS SANS reduction interface.
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from qtpy.QtCore import QRegExp
diff --git a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
index f04d99dbc8d..4fa4a9d5eec 100644
--- a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
+++ b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
@@ -11,7 +11,6 @@ from the individual rows in the data table. This view is useful for checking the
and helps the developer to identify issues.
"""
-from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
import os
from qtpy import QtWidgets
diff --git a/scripts/Interface/ui/sans_isis/summation_settings_widget.py b/scripts/Interface/ui/sans_isis/summation_settings_widget.py
index b80a591bf85..cb1d2f857bd 100644
--- a/scripts/Interface/ui/sans_isis/summation_settings_widget.py
+++ b/scripts/Interface/ui/sans_isis/summation_settings_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
diff --git a/scripts/LargeScaleStructures/EQSANS_geometry.py b/scripts/LargeScaleStructures/EQSANS_geometry.py
index b8cd5667b6d..303b277ff0f 100644
--- a/scripts/LargeScaleStructures/EQSANS_geometry.py
+++ b/scripts/LargeScaleStructures/EQSANS_geometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .geometry_writer import MantidGeom
import math
diff --git a/scripts/LargeScaleStructures/PolrefTest.py b/scripts/LargeScaleStructures/PolrefTest.py
index be34f82161f..6cef5ddaa58 100644
--- a/scripts/LargeScaleStructures/PolrefTest.py
+++ b/scripts/LargeScaleStructures/PolrefTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from .ReflectometerCors import *
diff --git a/scripts/LargeScaleStructures/REF_L_geometry.py b/scripts/LargeScaleStructures/REF_L_geometry.py
index db7ee1159ce..895bef04c3d 100644
--- a/scripts/LargeScaleStructures/REF_L_geometry.py
+++ b/scripts/LargeScaleStructures/REF_L_geometry.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .geometry_writer import MantidGeom
import mantid.simpleapi as mantid
diff --git a/scripts/LargeScaleStructures/ReflectometerCors.py b/scripts/LargeScaleStructures/ReflectometerCors.py
index 14d8411622f..b07d5ad10a7 100644
--- a/scripts/LargeScaleStructures/ReflectometerCors.py
+++ b/scripts/LargeScaleStructures/ReflectometerCors.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/LargeScaleStructures/data_stitching.py b/scripts/LargeScaleStructures/data_stitching.py
index 68492616653..7af99d7a7a4 100644
--- a/scripts/LargeScaleStructures/data_stitching.py
+++ b/scripts/LargeScaleStructures/data_stitching.py
@@ -8,7 +8,6 @@
"""
Data stitching for SANS and reflectometry
"""
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid.kernel import Logger
diff --git a/scripts/LargeScaleStructures/geometry_writer.py b/scripts/LargeScaleStructures/geometry_writer.py
index 1b5a0a8c5af..b63ea581a67 100644
--- a/scripts/LargeScaleStructures/geometry_writer.py
+++ b/scripts/LargeScaleStructures/geometry_writer.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from xml.dom.minidom import getDOMImplementation
from datetime import datetime
import re
diff --git a/scripts/MantidIPython/__init__.py b/scripts/MantidIPython/__init__.py
index a8c8b499620..3b0a8c2dac1 100644
--- a/scripts/MantidIPython/__init__.py
+++ b/scripts/MantidIPython/__init__.py
@@ -11,7 +11,6 @@ Some tools for use in ipython notebooks generated by Mantid.
# Suppress warnings about unused import as these
# imports are important for iPython
-from __future__ import (absolute_import, division, print_function)
from MantidIPython.plot_functions import * # noqa: F401
import warnings # noqa: F401
import mantid.kernel # noqa: F401
diff --git a/scripts/MantidIPython/plot_functions.py b/scripts/MantidIPython/plot_functions.py
index a06b74ad0ca..31dec186e10 100644
--- a/scripts/MantidIPython/plot_functions.py
+++ b/scripts/MantidIPython/plot_functions.py
@@ -8,7 +8,6 @@
Plotting functions for use in IPython notebooks that are generated by MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
import matplotlib.pyplot as plt
# Import Mantid
diff --git a/scripts/MultiPlotting/edit_windows/remove_plot_window.py b/scripts/MultiPlotting/edit_windows/remove_plot_window.py
index 6eec769417d..58f32431a73 100644
--- a/scripts/MultiPlotting/edit_windows/remove_plot_window.py
+++ b/scripts/MultiPlotting/edit_windows/remove_plot_window.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtCore, QtWidgets
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/MultiPlotting/edit_windows/select_subplot.py b/scripts/MultiPlotting/edit_windows/select_subplot.py
index 92fdb267813..30469feaed1 100644
--- a/scripts/MultiPlotting/edit_windows/select_subplot.py
+++ b/scripts/MultiPlotting/edit_windows/select_subplot.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/MultiPlotting/gridspec_engine.py b/scripts/MultiPlotting/gridspec_engine.py
index 272b2074424..2cc581762e1 100644
--- a/scripts/MultiPlotting/gridspec_engine.py
+++ b/scripts/MultiPlotting/gridspec_engine.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib.gridspec import GridSpec
import math
diff --git a/scripts/MultiPlotting/multi_plotting_widget.py b/scripts/MultiPlotting/multi_plotting_widget.py
index de2329899f1..5627114b5dd 100644
--- a/scripts/MultiPlotting/multi_plotting_widget.py
+++ b/scripts/MultiPlotting/multi_plotting_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from copy import deepcopy
from MultiPlotting.subplot.subplot import subplot
diff --git a/scripts/MultiPlotting/navigation_toolbar.py b/scripts/MultiPlotting/navigation_toolbar.py
index c9566b5d3cf..3780b57ae78 100644
--- a/scripts/MultiPlotting/navigation_toolbar.py
+++ b/scripts/MultiPlotting/navigation_toolbar.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtGui
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
diff --git a/scripts/MultiPlotting/subplot/subplot.py b/scripts/MultiPlotting/subplot/subplot.py
index a0c72b0972b..7c599db34c0 100644
--- a/scripts/MultiPlotting/subplot/subplot.py
+++ b/scripts/MultiPlotting/subplot/subplot.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from copy import deepcopy
diff --git a/scripts/MultiPlotting/subplot/subplot_ADS_observer.py b/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
index 4556adf1229..c94c85cebcd 100644
--- a/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
+++ b/scripts/MultiPlotting/subplot/subplot_ADS_observer.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.api import AnalysisDataServiceObserver
diff --git a/scripts/MultiPlotting/subplot/subplot_context.py b/scripts/MultiPlotting/subplot/subplot_context.py
index 6bc18e7315c..a6322e4340b 100644
--- a/scripts/MultiPlotting/subplot/subplot_context.py
+++ b/scripts/MultiPlotting/subplot/subplot_context.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six import iteritems
from mantid import plots
from copy import copy
diff --git a/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py b/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
index 3255bc3efd7..54dba9366aa 100644
--- a/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
+++ b/scripts/Muon/GUI/Common/ADSHandler/muon_workspace_wrapper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=F0401
-from __future__ import (absolute_import, division, print_function)
from mantid.api import Workspace, AnalysisDataService
from mantid.simpleapi import RenameWorkspace, GroupWorkspaces
diff --git a/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py b/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
index 97aab03dc77..c5306e13bba 100644
--- a/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
+++ b/scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
group_str = "; Group; "
diff --git a/scripts/Muon/GUI/Common/calculate_pair_and_group.py b/scripts/Muon/GUI/Common/calculate_pair_and_group.py
index 06bba6dae21..68947d3e069 100644
--- a/scripts/Muon/GUI/Common/calculate_pair_and_group.py
+++ b/scripts/Muon/GUI/Common/calculate_pair_and_group.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import Muon.GUI.Common.utilities.algorithm_utils as algorithm_utils
diff --git a/scripts/Muon/GUI/Common/checkbox.py b/scripts/Muon/GUI/Common/checkbox.py
index 4d925e5863e..7fe7b683443 100644
--- a/scripts/Muon/GUI/Common/checkbox.py
+++ b/scripts/Muon/GUI/Common/checkbox.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_model.py b/scripts/Muon/GUI/Common/context_example/context_example_model.py
index 6673b273eae..de5821377d7 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_model.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common import group_object
from Muon.GUI.Common import pair_object
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
index c46d45a9036..4c828cf2062 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class ContextExamplePresenter(object):
def __init__(self, view, model):
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_view.py b/scripts/Muon/GUI/Common/context_example/context_example_view.py
index dfa139579fd..eb842052117 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_view.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtCore, QtWidgets
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_widget.py b/scripts/Muon/GUI/Common/context_example/context_example_widget.py
index f9aca966a31..cbe2317c8b1 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_widget.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_widget.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from Muon.GUI.Common.context_example.context_example_view import ContextExampleView
from Muon.GUI.Common.context_example.context_example_presenter import ContextExamplePresenter
from Muon.GUI.Common.context_example.context_example_model import ContextExampleModel
diff --git a/scripts/Muon/GUI/Common/contexts/fitting_context.py b/scripts/Muon/GUI/Common/contexts/fitting_context.py
index adf6d1398d7..a4e9cc55fac 100644
--- a/scripts/Muon/GUI/Common/contexts/fitting_context.py
+++ b/scripts/Muon/GUI/Common/contexts/fitting_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from collections import OrderedDict
import re
diff --git a/scripts/Muon/GUI/Common/contexts/muon_context.py b/scripts/Muon/GUI/Common/contexts/muon_context.py
index 25bb0fe44ff..0f98ba53fe4 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.ADSHandler.workspace_naming import (get_raw_data_workspace_name, get_group_data_workspace_name,
get_pair_data_workspace_name, get_base_data_directory,
get_group_asymmetry_name,
diff --git a/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py b/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
index a00871a5ce1..3a4e3fc6008 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_context_ADS_observer.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from mantid.api import AnalysisDataServiceObserver, WorkspaceGroup
from functools import wraps
import sys
diff --git a/scripts/Muon/GUI/Common/contexts/muon_data_context.py b/scripts/Muon/GUI/Common/contexts/muon_data_context.py
index 17fdc8f7b19..fe808fe9917 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_data_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_data_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import Muon.GUI.Common.utilities.load_utils as load_utils
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py b/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
index b348039d81c..94b9e597810 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_group_pair_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import Muon.GUI.Common.utilities.xml_utils as xml_utils
diff --git a/scripts/Muon/GUI/Common/contexts/muon_gui_context.py b/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
index c0e929eb5e8..60647c6edbb 100644
--- a/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
+++ b/scripts/Muon/GUI/Common/contexts/muon_gui_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantidqt.utils.observer_pattern import Observable
diff --git a/scripts/Muon/GUI/Common/contexts/phase_table_context.py b/scripts/Muon/GUI/Common/contexts/phase_table_context.py
index c04dd95cece..421f9e0adfe 100644
--- a/scripts/Muon/GUI/Common/contexts/phase_table_context.py
+++ b/scripts/Muon/GUI/Common/contexts/phase_table_context.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
default_dict = {'first_good_time': 0.1, 'last_good_time': 15, 'forward_group': 'fwd', 'backward_group': 'bwd', 'input_workspace': '',
'phase_quad_input_workspace': '', 'phase_table_for_phase_quad': ''}
diff --git a/scripts/Muon/GUI/Common/dock/dock_view.py b/scripts/Muon/GUI/Common/dock/dock_view.py
index 215fe68c9b7..56b97d3b6e8 100644
--- a/scripts/Muon/GUI/Common/dock/dock_view.py
+++ b/scripts/Muon/GUI/Common/dock/dock_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/Common/dock/dockable_tabs.py b/scripts/Muon/GUI/Common/dock/dockable_tabs.py
index e47ea72320a..a562f952234 100644
--- a/scripts/Muon/GUI/Common/dock/dockable_tabs.py
+++ b/scripts/Muon/GUI/Common/dock/dockable_tabs.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
from qtpy import QtWidgets, QtCore, QtGui, PYQT4
from qtpy.QtCore import Slot
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
index 9929b766792..c52c94b829e 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class DummyPresenter(object):
def __init__(self,view,model):
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_view.py b/scripts/Muon/GUI/Common/dummy/dummy_view.py
index 4caceb9d613..2d98d6bddee 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_view.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_widget.py b/scripts/Muon/GUI/Common/dummy/dummy_widget.py
index 6747bbea2e4..4edad0589df 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_widget.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_widget.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from Muon.GUI.Common.dummy.dummy_view import DummyView
from Muon.GUI.Common.dummy.dummy_presenter import DummyPresenter
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
index 7be742bef59..4e88d464fc0 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class DummyLabelModel(object):
def __init__(self, context, key):
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
index 2d69d0ab849..d98d96b7745 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class DummyLabelPresenter(object):
"""
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
index 786f900a342..bd82af777a6 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_view.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
index d42c2a24373..49a24d0b842 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.dummy_label.dummy_label_view import DummyLabelView
from Muon.GUI.Common.dummy_label.dummy_label_presenter import DummyLabelPresenter
from Muon.GUI.Common.dummy_label.dummy_label_model import DummyLabelModel
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
index 3444f771e36..faa6f83df02 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.utilities.algorithm_utils import run_Fit, run_simultaneous_Fit, run_CalculateMuonAsymmetry
from Muon.GUI.Common.ADSHandler.workspace_naming import *
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
index 375bad229bc..86f0a81b8a4 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.fitting_tab_widget.workspace_selector_view import WorkspaceSelectorView
from mantidqt.utils.observer_pattern import GenericObserver, GenericObserverWithArgPassing, GenericObservable
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapperWithOutput
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
index 64f70f916fb..d791afb418d 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
index d6fc5812d92..698f0b95b6f 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/fitting_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_view import FittingTabView
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_presenter import FittingTabPresenter
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_model import FittingTabModel
diff --git a/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py b/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
index 7e508019660..5a19df66aef 100644
--- a/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
+++ b/scripts/Muon/GUI/Common/fitting_tab_widget/workspace_selector_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from mantidqt.utils.qt import load_ui
diff --git a/scripts/Muon/GUI/Common/group_object.py b/scripts/Muon/GUI/Common/group_object.py
index 167a0b4d536..fd01718f705 100644
--- a/scripts/Muon/GUI/Common/group_object.py
+++ b/scripts/Muon/GUI/Common/group_object.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import pythonTSV as TSVHelper
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
index 719c2daf2c0..14a092685d8 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.grouping_table_widget.grouping_table_widget_view import GroupingTableView
from Muon.GUI.Common.grouping_table_widget.grouping_table_widget_presenter import GroupingTablePresenter
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
index 661affe491a..c51b396c5e3 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.contexts.muon_data_context import construct_empty_group, construct_empty_pair
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
index 38b599d1be0..0543ddff8e0 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.observer_pattern import Observer, Observable, GenericObservable, GenericObserver
import Muon.GUI.Common.utilities.muon_file_utils as file_utils
import Muon.GUI.Common.utilities.xml_utils as xml_utils
diff --git a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
index e2bdf558ff7..b657173dec8 100644
--- a/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
+++ b/scripts/Muon/GUI/Common/grouping_tab_widget/grouping_tab_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, PYQT4, QtCore, QtGui
from Muon.GUI.Common.utilities.run_string_utils import run_string_regex
from Muon.GUI.Common.message_box import warning, question
diff --git a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
index 646dba409d3..b616bb1e033 100644
--- a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
from Muon.GUI.Common.utilities import run_string_utils as run_utils
diff --git a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
index 1cd4fecb95c..13cf8df0a3b 100644
--- a/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
+++ b/scripts/Muon/GUI/Common/grouping_table_widget/grouping_table_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtGui, QtCore
from qtpy.QtCore import Signal
import sys
diff --git a/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py b/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
index 73851a53325..ecc2fe1ea6d 100644
--- a/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/help_widget/help_widget_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.Common.help_widget.help_widget_view import HelpWidgetView
diff --git a/scripts/Muon/GUI/Common/help_widget/help_widget_view.py b/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
index 8ddae50bcea..da1db7b2a6a 100644
--- a/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
+++ b/scripts/Muon/GUI/Common/help_widget/help_widget_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets
import Muon.GUI.Common.message_box as message_box
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
index 2982446416e..37c95c8fd06 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from decimal import Decimal, InvalidOperation
from mantid import api
from mantid.api import ITableWorkspace
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
index 400c74ddd97..13648fddb71 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
import Muon.GUI.Common.utilities.load_utils as load_utils
from Muon.GUI.Common.utilities.muon_file_utils import filter_for_extensions
diff --git a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
index b7b615a36e1..5b74561c51f 100644
--- a/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
+++ b/scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
from Muon.GUI.Common.utilities.muon_file_utils import allowed_instruments, show_file_browser_and_return_selection
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
index 0dd50b86715..afc1abb0dc2 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
millions_counts_conversion = 1. / 1e6
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
index 4451aa7eacc..7d0ecd97e80 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
index 43f8c489532..ff4ab6176ef 100644
--- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
+++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from qtpy import QtWidgets, QtGui
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
index dee45d9a45f..dd671bcb1cc 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class HomeTabModel(object):
def __init__(self, context=None):
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py b/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
index d308f9b881a..a2dfb07bc58 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from mantidqt.utils.observer_pattern import Observer, GenericObserver
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_view.py b/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
index ad7ac86e924..6655e9d978d 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py b/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
index 07611a002fe..232eefdadce 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_model import InstrumentWidgetModel
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_view import InstrumentWidgetView
from Muon.GUI.Common.home_instrument_widget.home_instrument_widget_presenter import InstrumentWidgetPresenter
diff --git a/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py b/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
index 3a89007294a..986903ad151 100644
--- a/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
+++ b/scripts/Muon/GUI/Common/list_selector/TableWidgetDragRows.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
# Original from https://stackoverflow.com/questions/26227885/drag-and-drop-rows-within-qtablewidget
from qtpy.QtCore import Qt
from qtpy.QtWidgets import QTableWidget, QAbstractItemView, QTableWidgetItem
diff --git a/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py b/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
index be787b66978..eccb5161388 100644
--- a/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
+++ b/scripts/Muon/GUI/Common/list_selector/list_selector_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
model_position = 0
model_selected = 1
model_enabled = 2
diff --git a/scripts/Muon/GUI/Common/list_selector/list_selector_view.py b/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
index f2aedd1f77e..8d22598f9eb 100644
--- a/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
+++ b/scripts/Muon/GUI/Common/list_selector/list_selector_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
import functools
from qtpy.QtCore import Qt
diff --git a/scripts/Muon/GUI/Common/load_file_widget/model.py b/scripts/Muon/GUI/Common/load_file_widget/model.py
index cebf0773573..d051f1964c6 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/model.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.kernel import ConfigService
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/Muon/GUI/Common/load_file_widget/presenter.py b/scripts/Muon/GUI/Common/load_file_widget/presenter.py
index f6a9a90e139..66ced786983 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/presenter.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/load_file_widget/view.py b/scripts/Muon/GUI/Common/load_file_widget/view.py
index 4f293d104b0..7f077851276 100644
--- a/scripts/Muon/GUI/Common/load_file_widget/view.py
+++ b/scripts/Muon/GUI/Common/load_file_widget/view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from qtpy.QtCore import Signal
import Muon.GUI.Common.message_box as message_box
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
index 9b81bbdcd39..05d3d2d0ab6 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.Common.muon_load_data import MuonLoadData
import Muon.GUI.Common.utilities.load_utils as load_utils
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
index 566afd7a2bd..c58a2a4c51a 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py b/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
index cf44de59d1b..9941407038a 100644
--- a/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
+++ b/scripts/Muon/GUI/Common/load_run_widget/load_run_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
diff --git a/scripts/Muon/GUI/Common/message_box.py b/scripts/Muon/GUI/Common/message_box.py
index b01fb7cf781..90fa457229a 100644
--- a/scripts/Muon/GUI/Common/message_box.py
+++ b/scripts/Muon/GUI/Common/message_box.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/Common/muon_context/muon_context.py b/scripts/Muon/GUI/Common/muon_context/muon_context.py
index c566385c967..2ef3066e201 100644
--- a/scripts/Muon/GUI/Common/muon_context/muon_context.py
+++ b/scripts/Muon/GUI/Common/muon_context/muon_context.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Muon context - contains all of the values from the GUI
-from __future__ import (absolute_import, division, print_function)
from collections import OrderedDict
import copy
diff --git a/scripts/Muon/GUI/Common/muon_group.py b/scripts/Muon/GUI/Common/muon_group.py
index 24b1420ba3e..ad4badba2fd 100644
--- a/scripts/Muon/GUI/Common/muon_group.py
+++ b/scripts/Muon/GUI/Common/muon_group.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=C0111
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
import six
diff --git a/scripts/Muon/GUI/Common/muon_load_data.py b/scripts/Muon/GUI/Common/muon_load_data.py
index aac1de09232..e8827e54ae0 100644
--- a/scripts/Muon/GUI/Common/muon_load_data.py
+++ b/scripts/Muon/GUI/Common/muon_load_data.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import Muon.GUI.Common.utilities.load_utils as load_utils
diff --git a/scripts/Muon/GUI/Common/muon_pair.py b/scripts/Muon/GUI/Common/muon_pair.py
index 71515fb8350..105d3fee4e6 100644
--- a/scripts/Muon/GUI/Common/muon_pair.py
+++ b/scripts/Muon/GUI/Common/muon_pair.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=C0111
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
diff --git a/scripts/Muon/GUI/Common/pair_object.py b/scripts/Muon/GUI/Common/pair_object.py
index 11323244d35..650520e6277 100644
--- a/scripts/Muon/GUI/Common/pair_object.py
+++ b/scripts/Muon/GUI/Common/pair_object.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
import pythonTSV as TSVHelper
diff --git a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
index 006f65bfc21..de27f300b40 100644
--- a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import re
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
index 62e61abe310..b1c17e31f63 100644
--- a/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
+++ b/scripts/Muon/GUI/Common/pairing_table_widget/pairing_table_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from qtpy.QtCore import Signal
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
index 00ee926d0f7..9c3d550364b 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapper
from Muon.GUI.Common import thread_model
from Muon.GUI.Common.utilities.algorithm_utils import run_CalMuonDetectorPhases, run_PhaseQuad
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
index 05ea07c4c5b..b6f9dc8b221 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
index 10978081fd4..16088612277 100644
--- a/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
+++ b/scripts/Muon/GUI/Common/phase_table_widget/phase_table_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.phase_table_widget.phase_table_view import PhaseTableView
from Muon.GUI.Common.phase_table_widget.phase_table_presenter import PhaseTablePresenter
diff --git a/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py b/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
index 2aeea10c3f9..02c47ed8e07 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/dockable_plot_toolbar.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from matplotlib.backends.qt_compat import is_pyqt5
if is_pyqt5():
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
index 073ac51c26f..9e9094e07b6 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.plotting_widget.plotting_widget_view import PlotWidgetView
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
from Muon.GUI.Common.plotting_widget.plotting_widget_model import PlotWidgetModel
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
index 770884a83e8..1b4dde5dce7 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_model.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from mantid.api import AnalysisDataService
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
index 65031995bf7..aa663d1ee88 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import re
from Muon.GUI.Common.home_tab.home_tab_presenter import HomeTabSubWidget
from mantidqt.utils.observer_pattern import GenericObservable, GenericObserver, GenericObserverWithArgPassing
diff --git a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
index 03fa2ad3815..410309654b9 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/plotting_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
import Muon.GUI.Common.message_box as message_box
from Muon.GUI.Common.plotting_widget.dockable_plot_toolbar import DockablePlotToolbar
diff --git a/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py b/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
index 485a53bde8b..33c3473309b 100644
--- a/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
+++ b/scripts/Muon/GUI/Common/plotting_widget/workspace_finder.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
COUNTS_PLOT_TYPE = 'Counts'
ASYMMETRY_PLOT_TYPE = 'Asymmetry'
FREQ_PLOT_TYPE = "Frequency "
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
index 7e6fc7f1197..22072ddb643 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.api import AnalysisDataService as ads, WorkspaceFactory
from mantid.kernel import FloatTimeSeriesProperty
from enum import Enum
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
index dd7ae93f21a..26c88062aac 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from qtpy.QtCore import QMetaObject, QObject, Slot
from mantidqt.utils.observer_pattern import GenericObserver
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
index 608fb37c9fc..8695fc9084c 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.qt import load_ui
from qtpy import PYQT4, QtCore, QtWidgets
diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
index 903b3c245af..145b60d1aa1 100644
--- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
+++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division)
-
from Muon.GUI.Common.results_tab_widget.results_tab_presenter import ResultsTabPresenter
from Muon.GUI.Common.results_tab_widget.results_tab_view import ResultsTabView
from Muon.GUI.Common.results_tab_widget.results_tab_model import ResultsTabModel
diff --git a/scripts/Muon/GUI/Common/run_selection_dialog.py b/scripts/Muon/GUI/Common/run_selection_dialog.py
index 14b692e88c0..b8b8499e42d 100644
--- a/scripts/Muon/GUI/Common/run_selection_dialog.py
+++ b/scripts/Muon/GUI/Common/run_selection_dialog.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
index 851aa58f3aa..3b7280618a2 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_presenter.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from mantidqt.utils.observer_pattern import GenericObserver, GenericObserverWithArgPassing
from Muon.GUI.Common.thread_model_wrapper import ThreadModelWrapperWithOutput
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
index f7f3849ec43..12a19c08967 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QtGui
from mantidqt.utils.qt import load_ui
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
index 92609bd2b2c..089b6a73c76 100644
--- a/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
+++ b/scripts/Muon/GUI/Common/seq_fitting_tab_widget/seq_fitting_tab_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_view import SeqFittingTabView
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_presenter import SeqFittingTabPresenter
diff --git a/scripts/Muon/GUI/Common/test_helpers/context_setup.py b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
index a5c19ce2864..233eb2b8014 100644
--- a/scripts/Muon/GUI/Common/test_helpers/context_setup.py
+++ b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.contexts.muon_context import MuonContext
from Muon.GUI.Common.contexts.muon_data_context import MuonDataContext
from Muon.GUI.Common.contexts.muon_group_pair_context import MuonGroupPairContext
diff --git a/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py b/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
index 683a9fe972d..31bc8b873a1 100644
--- a/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
+++ b/scripts/Muon/GUI/Common/test_helpers/general_test_helpers.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.simpleapi import CreateWorkspace
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
from Muon.GUI.Common.muon_group import MuonGroup
diff --git a/scripts/Muon/GUI/Common/thread_model.py b/scripts/Muon/GUI/Common/thread_model.py
index 15d18ca62c4..8d40dfcc3ee 100644
--- a/scripts/Muon/GUI/Common/thread_model.py
+++ b/scripts/Muon/GUI/Common/thread_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from qtpy.QtCore import Signal
from qtpy.QtCore import Slot
diff --git a/scripts/Muon/GUI/Common/thread_model_wrapper.py b/scripts/Muon/GUI/Common/thread_model_wrapper.py
index f8380287286..3f3a91c2835 100644
--- a/scripts/Muon/GUI/Common/thread_model_wrapper.py
+++ b/scripts/Muon/GUI/Common/thread_model_wrapper.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class ThreadModelWrapper(object):
def __init__(self, function=None):
self.callback = function
diff --git a/scripts/Muon/GUI/Common/usage_report.py b/scripts/Muon/GUI/Common/usage_report.py
index a509ccf7175..a360df9f665 100644
--- a/scripts/Muon/GUI/Common/usage_report.py
+++ b/scripts/Muon/GUI/Common/usage_report.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from mantid.kernel import (UsageService, FeatureType)
diff --git a/scripts/Muon/GUI/Common/utilities/algorithm_utils.py b/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
index cdfb512fe4e..652b39f6173 100644
--- a/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/algorithm_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from mantid.kernel import Logger
diff --git a/scripts/Muon/GUI/Common/utilities/load_utils.py b/scripts/Muon/GUI/Common/utilities/load_utils.py
index 59280fef37a..9d8216d2598 100644
--- a/scripts/Muon/GUI/Common/utilities/load_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/load_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import mantid.simpleapi as mantid
from mantid.api import WorkspaceGroup, AnalysisDataService
diff --git a/scripts/Muon/GUI/Common/utilities/muon_file_utils.py b/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
index e10ba9f33cd..44885d27455 100644
--- a/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/muon_file_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.api import FileFinder
from Muon.GUI.Common.message_box import warning
diff --git a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
index 8590b67fb65..bc7223dcefa 100644
--- a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
+++ b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class IteratorWithException:
"""Wraps a simple iterable (i.e. list) so that it throws a ValueError on a particular index."""
diff --git a/scripts/Muon/GUI/Common/utilities/run_string_utils.py b/scripts/Muon/GUI/Common/utilities/run_string_utils.py
index 1c57e918920..b4fb1810acf 100644
--- a/scripts/Muon/GUI/Common/utilities/run_string_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/run_string_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from itertools import groupby
from operator import itemgetter
import functools
diff --git a/scripts/Muon/GUI/Common/utilities/table_utils.py b/scripts/Muon/GUI/Common/utilities/table_utils.py
index 78a342160f4..8204cd5899f 100644
--- a/scripts/Muon/GUI/Common/utilities/table_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/table_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
from functools import wraps
import sys
diff --git a/scripts/Muon/GUI/Common/utilities/xml_utils.py b/scripts/Muon/GUI/Common/utilities/xml_utils.py
index 42eebfec8a6..bf45aa46fdf 100644
--- a/scripts/Muon/GUI/Common/utilities/xml_utils.py
+++ b/scripts/Muon/GUI/Common/utilities/xml_utils.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import xml.etree.ElementTree as ET
import Muon.GUI.Common.utilities.run_string_utils as run_string_utils
diff --git a/scripts/Muon/GUI/Common/validate_errors.py b/scripts/Muon/GUI/Common/validate_errors.py
index f68fd4695c2..c15c36a0d3b 100644
--- a/scripts/Muon/GUI/Common/validate_errors.py
+++ b/scripts/Muon/GUI/Common/validate_errors.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
def validateToErrors(alg):
errors = alg.validateInputs()
if not errors:
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
index b2f17882df8..9f828c783aa 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class DetectorsPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
index 75ed5cfec54..acba523e33d 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from collections import OrderedDict
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
index 22dadf60380..10f0a73b813 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class LineSelectorPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
index 6eb808d4411..cdec801ae32 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorView.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
index accef1154de..2b81b1e39ff 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from collections import OrderedDict
import glob
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
index e12e1cf5c6a..362e623aea4 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class PeaksPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
index 443d5b67949..97c4c28162a 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from qtpy import QtWidgets
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
index 6649710971f..faa9e8d6527 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
-
class PeakSelectorPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
index 13d8c6f85d0..5b06950da42 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
from qtpy import QtWidgets, QtCore
from six import iteritems
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
index bad67e3c44a..f4884f50715 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from six import iteritems
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
index a68735c1603..3fcfe7b3cca 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import mantid.simpleapi as mantid
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
index 164257639d1..847e611430e 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_presenter_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import mantid.simpleapi as mantid
from Muon.GUI.Common import thread_model
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
index e58e83f59e6..1adc87d638a 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
index dcd9ccc953b..ef2163aac8d 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_view_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
index dd3247b9a4a..12db1e90b1f 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_view import FFTView
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_presenter import FFTPresenter
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_model import FFTModel, FFTWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
index 4e299e066f3..daebfdbffb3 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_widget_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_view_new import FFTView
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_presenter_new import FFTPresenter
from Muon.GUI.FrequencyDomainAnalysis.FFT.fft_model import FFTModel, FFTWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
index ffc8475b28c..24a158ff398 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from six import iteritems
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
index 01ddb16a71b..8ccf6b5698f 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
import math
from Muon.GUI.Common import thread_model
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
index 40dc119eb90..d70a7004fb4 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import functools
import math
import re
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
index ef25f6be571..4788ba04130 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
index 45026d915d9..2c184051252 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_view_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
from Muon.GUI.Common.utilities import table_utils
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
index d5f24f57c6b..68170ab34b0 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_view import MaxEntView
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_presenter import MaxEntPresenter
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_model import MaxEntModel, MaxEntWrapper
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
index ffeb7850945..bad67eb534f 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_widget_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_view_new import MaxEntView
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_presenter_new import MaxEntPresenter
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
index a25d2b23f09..66d4f3dc9af 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
index 6abbe3c247d..a7f467fd449 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/Transform/transform_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.Transform.transform_view import TransformView
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_widget import TransformSelectionWidget
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
index 49487500383..156aba8ede0 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
class TransformSelectionPresenter(object):
"""
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
index a3435824ea5..d26ead698df 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
index 39485ee0482..396c1c02f15 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_view import TransformSelectionView
from Muon.GUI.FrequencyDomainAnalysis.TransformSelection.transform_selection_presenter import TransformSelectionPresenter
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
index 0b6c02295cf..46d09faa0a3 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from re import findall
from six import iteritems
from mantid import AnalysisDataService
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
index e7c8ed9ccce..a3c9861ff25 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_domain_analysis_2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QT_VERSION
from distutils.version import LooseVersion
diff --git a/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py b/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
index 2bd5be10d7d..0b483206231 100644
--- a/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
+++ b/scripts/Muon/GUI/MuonAnalysis/dock/dock_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
from Muon.GUI.Common.context_example.context_example_widget import ContextExampleWidget
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
index 590ca2e068a..8d9791d241e 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.load_file_widget.view import BrowseFileWidgetView
from Muon.GUI.Common.load_file_widget.presenter import BrowseFileWidgetPresenter
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
index 15c91234d0b..4834d23b18f 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
index 99d8ab433d8..e15d4e70cc0 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantidqt.utils.observer_pattern import Observer, Observable, GenericObserver
CO_ADD = 'Co-Add'
diff --git a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
index 2c02af93187..4f9c5e24f44 100644
--- a/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
+++ b/scripts/Muon/GUI/MuonAnalysis/load_widget/load_widget_view.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets
diff --git a/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py b/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
index 49073ee8305..4d51658339d 100644
--- a/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
+++ b/scripts/Muon/GUI/MuonAnalysis/muon_analysis_2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
from qtpy import QtWidgets, QtCore, QT_VERSION
from distutils.version import LooseVersion
diff --git a/scripts/Muon/MaxentTools/back.py b/scripts/Muon/MaxentTools/back.py
index 4b21aa10524..2be429a121b 100644
--- a/scripts/Muon/MaxentTools/back.py
+++ b/scripts/Muon/MaxentTools/back.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
"""
diff --git a/scripts/Muon/MaxentTools/chinow.py b/scripts/Muon/MaxentTools/chinow.py
index 75de4c5c858..c020b6cb782 100644
--- a/scripts/Muon/MaxentTools/chinow.py
+++ b/scripts/Muon/MaxentTools/chinow.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.chosol import CHOSOL
diff --git a/scripts/Muon/MaxentTools/chosol.py b/scripts/Muon/MaxentTools/chosol.py
index 328ecc169bc..2a2f4a32f7c 100644
--- a/scripts/Muon/MaxentTools/chosol.py
+++ b/scripts/Muon/MaxentTools/chosol.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import numpy as np
import math
diff --git a/scripts/Muon/MaxentTools/dead_detector_handler.py b/scripts/Muon/MaxentTools/dead_detector_handler.py
index fa3887063fc..b054842da55 100644
--- a/scripts/Muon/MaxentTools/dead_detector_handler.py
+++ b/scripts/Muon/MaxentTools/dead_detector_handler.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid.simpleapi as mantid
diff --git a/scripts/Muon/MaxentTools/deadfit.py b/scripts/Muon/MaxentTools/deadfit.py
index 856ff79dcb1..f567c76e5e3 100644
--- a/scripts/Muon/MaxentTools/deadfit.py
+++ b/scripts/Muon/MaxentTools/deadfit.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/dist.py b/scripts/Muon/MaxentTools/dist.py
index 82d02c32e91..b05cd55b11e 100644
--- a/scripts/Muon/MaxentTools/dist.py
+++ b/scripts/Muon/MaxentTools/dist.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/input.py b/scripts/Muon/MaxentTools/input.py
index 739531ab252..81430a8e165 100644
--- a/scripts/Muon/MaxentTools/input.py
+++ b/scripts/Muon/MaxentTools/input.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
"""
diff --git a/scripts/Muon/MaxentTools/maxent.py b/scripts/Muon/MaxentTools/maxent.py
index ee2c46a47ec..2de214d78ed 100644
--- a/scripts/Muon/MaxentTools/maxent.py
+++ b/scripts/Muon/MaxentTools/maxent.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import numpy as np
import math
from Muon.MaxentTools.opus import OPUS
diff --git a/scripts/Muon/MaxentTools/modab.py b/scripts/Muon/MaxentTools/modab.py
index 4b5b86110ad..6bb45f07c78 100644
--- a/scripts/Muon/MaxentTools/modab.py
+++ b/scripts/Muon/MaxentTools/modab.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/modamp.py b/scripts/Muon/MaxentTools/modamp.py
index 7ea44b1799e..8266718dd7c 100644
--- a/scripts/Muon/MaxentTools/modamp.py
+++ b/scripts/Muon/MaxentTools/modamp.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/modbak.py b/scripts/Muon/MaxentTools/modbak.py
index c4d7ec21573..5539e505dca 100644
--- a/scripts/Muon/MaxentTools/modbak.py
+++ b/scripts/Muon/MaxentTools/modbak.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/move.py b/scripts/Muon/MaxentTools/move.py
index 59decbb33c2..c05d41226f5 100644
--- a/scripts/Muon/MaxentTools/move.py
+++ b/scripts/Muon/MaxentTools/move.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import math
from Muon.MaxentTools.chinow import CHINOW
diff --git a/scripts/Muon/MaxentTools/multimaxalpha.py b/scripts/Muon/MaxentTools/multimaxalpha.py
index 04e9f769a12..1f500586244 100644
--- a/scripts/Muon/MaxentTools/multimaxalpha.py
+++ b/scripts/Muon/MaxentTools/multimaxalpha.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.input import INPUT
diff --git a/scripts/Muon/MaxentTools/opus.py b/scripts/Muon/MaxentTools/opus.py
index 9093ed8e823..836a49f1192 100644
--- a/scripts/Muon/MaxentTools/opus.py
+++ b/scripts/Muon/MaxentTools/opus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/outspec.py b/scripts/Muon/MaxentTools/outspec.py
index 29221ce4737..da9b0683495 100644
--- a/scripts/Muon/MaxentTools/outspec.py
+++ b/scripts/Muon/MaxentTools/outspec.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
from Muon.MaxentTools.zft import ZFT
diff --git a/scripts/Muon/MaxentTools/project.py b/scripts/Muon/MaxentTools/project.py
index cf505c95c61..d860e034906 100644
--- a/scripts/Muon/MaxentTools/project.py
+++ b/scripts/Muon/MaxentTools/project.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/start.py b/scripts/Muon/MaxentTools/start.py
index d48d33c5317..b777e75943f 100644
--- a/scripts/Muon/MaxentTools/start.py
+++ b/scripts/Muon/MaxentTools/start.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import math
diff --git a/scripts/Muon/MaxentTools/tropus.py b/scripts/Muon/MaxentTools/tropus.py
index b2ab8eb9294..db96ef8d153 100644
--- a/scripts/Muon/MaxentTools/tropus.py
+++ b/scripts/Muon/MaxentTools/tropus.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
diff --git a/scripts/Muon/MaxentTools/zft.py b/scripts/Muon/MaxentTools/zft.py
index b81b67f6ec4..ebeac7f62e9 100644
--- a/scripts/Muon/MaxentTools/zft.py
+++ b/scripts/Muon/MaxentTools/zft.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
# param P not used!
diff --git a/scripts/Muon_Analysis.py b/scripts/Muon_Analysis.py
index 8522fe09dd3..ae52da0fc3c 100644
--- a/scripts/Muon_Analysis.py
+++ b/scripts/Muon_Analysis.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from Muon.GUI.MuonAnalysis.muon_analysis_2 import MuonAnalysisGui
from qtpy import QtCore
from Muon.GUI.Common.usage_report import report_interface_startup
diff --git a/scripts/ORNL_SANS.py b/scripts/ORNL_SANS.py
index bb6289e02e6..dbadb86ac27 100644
--- a/scripts/ORNL_SANS.py
+++ b/scripts/ORNL_SANS.py
@@ -8,7 +8,6 @@
"""
Script used to start the HFIR SANS reduction gui from Mantidplot
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_application import ReductionGUI
reducer = ReductionGUI(instrument_list=["BIOSANS", "GPSANS", "EQSANS"])
diff --git a/scripts/Powder_Diffraction_Reduction.py b/scripts/Powder_Diffraction_Reduction.py
index fe52af88b67..5e1862c96b9 100644
--- a/scripts/Powder_Diffraction_Reduction.py
+++ b/scripts/Powder_Diffraction_Reduction.py
@@ -8,7 +8,6 @@
"""
Script used to start the DGS reduction GUI from MantidPlot
"""
-from __future__ import (absolute_import, division, print_function)
import os
from reduction_application import ReductionGUI
diff --git a/scripts/PyChop/Chop.py b/scripts/PyChop/Chop.py
index c4ef62a270a..49b0c2d937d 100644
--- a/scripts/PyChop/Chop.py
+++ b/scripts/PyChop/Chop.py
@@ -23,7 +23,6 @@ technical reports:
http://www.neutronresearch.com/parch/1993/01/199301013280.pdf
"""
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import collections
import warnings
diff --git a/scripts/PyChop/ISISDisk.py b/scripts/PyChop/ISISDisk.py
index 049c2eab9e6..8d56cac44ab 100644
--- a/scripts/PyChop/ISISDisk.py
+++ b/scripts/PyChop/ISISDisk.py
@@ -12,7 +12,6 @@ Contains the ISISDisk class which calculates resolution and flux for ISIS Disk c
spectrometer (LET) - using the functions in MulpyRep and additional tables of instrument parameters
"""
-from __future__ import (absolute_import, division, print_function)
import warnings
import numpy as np
from . import MulpyRep
diff --git a/scripts/PyChop/ISISFermi.py b/scripts/PyChop/ISISFermi.py
index e74a78fe791..a5f64ebffec 100644
--- a/scripts/PyChop/ISISFermi.py
+++ b/scripts/PyChop/ISISFermi.py
@@ -13,7 +13,6 @@ Contains the ISISFermi class which calculates the resolution and flux for ISIS F
spectrometers (MAPS, MARI, MERLIN) - using the functions in Chop.py and addition lookup tables.
"""
-from __future__ import (absolute_import, division, print_function)
import warnings
import numpy as np
from . import Chop
diff --git a/scripts/PyChop/Instruments.py b/scripts/PyChop/Instruments.py
index 4ea8759b461..29ebfc0472a 100644
--- a/scripts/PyChop/Instruments.py
+++ b/scripts/PyChop/Instruments.py
@@ -9,7 +9,6 @@ This module is a wrapper around a set of instrument parameters (to be read from
and methods which then call either Chop.py or MulpyRep.py to do the resolution calculations.
"""
-from __future__ import (absolute_import, division, print_function)
from six import string_types
import numpy as np
import yaml
diff --git a/scripts/PyChop/MulpyRep.py b/scripts/PyChop/MulpyRep.py
index 030264e3cde..3aad68d272c 100644
--- a/scripts/PyChop/MulpyRep.py
+++ b/scripts/PyChop/MulpyRep.py
@@ -12,7 +12,6 @@ Contains a class to calculate the possible reps, resolution and flux for a direc
spectrometer. Python implementation by D J Voneshen based on the original Matlab program of R I Bewley.
"""
-from __future__ import (absolute_import, division, print_function)
from six import string_types
import numpy as np
import copy
diff --git a/scripts/PyChop/PyChop2.py b/scripts/PyChop/PyChop2.py
index bcc91912b86..e2752322541 100644
--- a/scripts/PyChop/PyChop2.py
+++ b/scripts/PyChop/PyChop2.py
@@ -11,7 +11,6 @@ This module contains the PyChop2 class which allows calculation of the resolutio
direct geometry time-of-flight inelastic neutron spectrometers.
"""
-from __future__ import (absolute_import, division, print_function)
from .ISISFermi import ISISFermi
from .ISISDisk import ISISDisk
import warnings
diff --git a/scripts/PyChop/PyChopGui.py b/scripts/PyChop/PyChopGui.py
index 589c45e954f..f170cfd3c29 100755
--- a/scripts/PyChop/PyChopGui.py
+++ b/scripts/PyChop/PyChopGui.py
@@ -14,7 +14,6 @@
This module contains a class to create a graphical user interface for PyChop.
"""
-from __future__ import (absolute_import, division, print_function)
from six import string_types
import sys
import re
diff --git a/scripts/PyChop/__init__.py b/scripts/PyChop/__init__.py
index d7ada5a222e..e595c68ae3c 100644
--- a/scripts/PyChop/__init__.py
+++ b/scripts/PyChop/__init__.py
@@ -23,5 +23,4 @@ resolution, flux = PyChop2.calculate(inst='maps', chtyp='a', freq=500, ei=600, e
PyChop2.showGUI()
"""
-from __future__ import (absolute_import, division, print_function)
from .Instruments import Instrument as PyChop2 # noqa: F401
diff --git a/scripts/QECoverage.py b/scripts/QECoverage.py
index 6d0447f7ff3..3a2bb7820d5 100644
--- a/scripts/QECoverage.py
+++ b/scripts/QECoverage.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=line-too-long, too-many-instance-attributes, invalid-name, missing-docstring, too-many-statements
# pylint: disable= too-many-branches, no-self-use
-from __future__ import (absolute_import, division, print_function)
from mantidqt.gui_helper import get_qapplication, show_interface_help
import numpy as np
import os
diff --git a/scripts/Reflectometry/isis_reflectometry/combineMulti.py b/scripts/Reflectometry/isis_reflectometry/combineMulti.py
index 59434f56c24..2a32e8abadb 100644
--- a/scripts/Reflectometry/isis_reflectometry/combineMulti.py
+++ b/scripts/Reflectometry/isis_reflectometry/combineMulti.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from .l2q import *
from mantid.simpleapi import *
from mantid.api import WorkspaceGroup
diff --git a/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py b/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
index f69337ee7d0..2b63662c85c 100644
--- a/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
+++ b/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as msi
import mantid.api
from mantid.kernel import logger
diff --git a/scripts/Reflectometry/isis_reflectometry/l2q.py b/scripts/Reflectometry/isis_reflectometry/l2q.py
index cb5b331047e..31c806b9365 100644
--- a/scripts/Reflectometry/isis_reflectometry/l2q.py
+++ b/scripts/Reflectometry/isis_reflectometry/l2q.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.simpleapi import * # New API
diff --git a/scripts/Reflectometry/isis_reflectometry/load_live_runs.py b/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
index 0e278973122..770ae600f49 100644
--- a/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
+++ b/scripts/Reflectometry/isis_reflectometry/load_live_runs.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/Reflectometry/isis_reflectometry/procedures.py b/scripts/Reflectometry/isis_reflectometry/procedures.py
index 50aa9860465..bb384df70a5 100644
--- a/scripts/Reflectometry/isis_reflectometry/procedures.py
+++ b/scripts/Reflectometry/isis_reflectometry/procedures.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, too-many-arguments, too-many-branches, too-many-locals
-from __future__ import (absolute_import, division, print_function)
from math import *
try:
diff --git a/scripts/Reflectometry/isis_reflectometry/quick.py b/scripts/Reflectometry/isis_reflectometry/quick.py
index 430f0be97e1..20216e7b638 100644
--- a/scripts/Reflectometry/isis_reflectometry/quick.py
+++ b/scripts/Reflectometry/isis_reflectometry/quick.py
@@ -15,7 +15,6 @@
'''
# these need to be moved into one NR folder or so
# from ReflectometerCors import *
-from __future__ import (absolute_import, division, print_function)
from isis_reflectometry.l2q import *
from isis_reflectometry.combineMulti import *
from mantid.simpleapi import * # New API
diff --git a/scripts/Reflectometry/isis_reflectometry/saveModule.py b/scripts/Reflectometry/isis_reflectometry/saveModule.py
index 9c8c63be26d..e6944ce16d3 100644
--- a/scripts/Reflectometry/isis_reflectometry/saveModule.py
+++ b/scripts/Reflectometry/isis_reflectometry/saveModule.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from PyQt4 import QtCore
from mantid.simpleapi import *
import numpy as n
diff --git a/scripts/Reflectometry/isis_reflectometry/settings.py b/scripts/Reflectometry/isis_reflectometry/settings.py
index 9d3842f74e9..47a49b02321 100644
--- a/scripts/Reflectometry/isis_reflectometry/settings.py
+++ b/scripts/Reflectometry/isis_reflectometry/settings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import xml.etree.ElementTree as XML
import os.path
diff --git a/scripts/SANS/DarkRunCorrection.py b/scripts/SANS/DarkRunCorrection.py
index 4aa9312a452..6f7051f87b7 100644
--- a/scripts/SANS/DarkRunCorrection.py
+++ b/scripts/SANS/DarkRunCorrection.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
diff --git a/scripts/SANS/ISISCommandInterface.py b/scripts/SANS/ISISCommandInterface.py
index c1423f59983..e3373be7208 100644
--- a/scripts/SANS/ISISCommandInterface.py
+++ b/scripts/SANS/ISISCommandInterface.py
@@ -9,7 +9,6 @@
Enables the SANS commands (listed at http://www.mantidproject.org/SANS) to
be run
"""
-from __future__ import (absolute_import, division, print_function)
import isis_instrument
from reducer_singleton import ReductionSingleton
from mantid.kernel import Logger
diff --git a/scripts/SANS/SANSBatchMode.py b/scripts/SANS/SANSBatchMode.py
index 8652fd5be5b..c3122c3082d 100644
--- a/scripts/SANS/SANSBatchMode.py
+++ b/scripts/SANS/SANSBatchMode.py
@@ -36,7 +36,6 @@
# The save directory must currently be specified in the Mantid.user.properties file
#Make the reduction module available
-from __future__ import (absolute_import, division, print_function)
from ISISCommandInterface import *
import SANSUtility as su
from mantid.simpleapi import *
diff --git a/scripts/SANS/SANSUserFileParser.py b/scripts/SANS/SANSUserFileParser.py
index 08de9f88c3c..cd315fe6eef 100644
--- a/scripts/SANS/SANSUserFileParser.py
+++ b/scripts/SANS/SANSUserFileParser.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
import re
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index bdd25fcf233..2255db7ca40 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -10,7 +10,6 @@
# This module contains utility functions common to the
# SANS data reduction scripts
########################################################
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import IEventWorkspace, MatrixWorkspace, WorkspaceGroup, FileLoaderRegistry, FileFinder
from mantid.kernel import DateAndTime
diff --git a/scripts/SANS/SANSadd2.py b/scripts/SANS/SANSadd2.py
index 1b7c08f163e..62eb72c924c 100644
--- a/scripts/SANS/SANSadd2.py
+++ b/scripts/SANS/SANSadd2.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
from shutil import copyfile
diff --git a/scripts/SANS/centre_finder.py b/scripts/SANS/centre_finder.py
index d3da5a8a9ad..d36c61efbf3 100644
--- a/scripts/SANS/centre_finder.py
+++ b/scripts/SANS/centre_finder.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from isis_reduction_steps import StripEndNans
from isis_instrument import LARMOR
from mantid.simpleapi import *
diff --git a/scripts/SANS/isis_instrument.py b/scripts/SANS/isis_instrument.py
index 5a45796d008..707ca35edbe 100644
--- a/scripts/SANS/isis_instrument.py
+++ b/scripts/SANS/isis_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, bare-except, too-many-instance-attributes
-from __future__ import (absolute_import, division, print_function)
import math
import os
import re
diff --git a/scripts/SANS/isis_reducer.py b/scripts/SANS/isis_reducer.py
index b962d7d1e23..d92cfcb8668 100644
--- a/scripts/SANS/isis_reducer.py
+++ b/scripts/SANS/isis_reducer.py
@@ -12,7 +12,6 @@
understand what's happening and how best to fit it in the Reducer design.
"""
-from __future__ import (absolute_import, division, print_function)
from reducer_singleton import Reducer
import isis_reduction_steps
import isis_instrument
diff --git a/scripts/SANS/isis_reduction_steps.py b/scripts/SANS/isis_reduction_steps.py
index d9adec01219..3d2cb8d8513 100644
--- a/scripts/SANS/isis_reduction_steps.py
+++ b/scripts/SANS/isis_reduction_steps.py
@@ -14,7 +14,6 @@
Most of this code is a copy-paste from SANSReduction.py, organized to be used with
ReductionStep objects. The guts needs refactoring.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import re
import math
diff --git a/scripts/SANS/reduction_settings.py b/scripts/SANS/reduction_settings.py
index df4eb1a3701..7cea24348ae 100644
--- a/scripts/SANS/reduction_settings.py
+++ b/scripts/SANS/reduction_settings.py
@@ -68,7 +68,6 @@ between reduction steps. The benefits to this new method are as follows:
passing settings to each other via PropertyManager objects.
"""
-from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
diff --git a/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py b/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
index b64471f3a08..9cb27be6390 100644
--- a/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
+++ b/scripts/SANS/sans/algorithm_detail/CreateSANSAdjustmentWorkspaces.py
@@ -8,8 +8,6 @@
wavelength adjustment and pixel-and-wavelength adjustment workspaces.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.calculate_sans_transmission import calculate_transmission
from sans.algorithm_detail.CreateSANSWavelengthPixelAdjustment import CreateSANSWavelengthPixelAdjustment
from sans.algorithm_detail.normalize_to_sans_monitor import normalize_to_monitor
diff --git a/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py b/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
index 846d3b2a59c..888f9527e06 100644
--- a/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
+++ b/scripts/SANS/sans/algorithm_detail/CreateSANSWavelengthPixelAdjustment.py
@@ -8,8 +8,6 @@
and wavelength adjustment.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.crop_helper import get_component_name
from sans.common.constants import EMPTY_NAME
from sans.common.enums import (DetectorType)
diff --git a/scripts/SANS/sans/algorithm_detail/batch_execution.py b/scripts/SANS/sans/algorithm_detail/batch_execution.py
index 2b1d1cd1f5e..1af602dcae9 100644
--- a/scripts/SANS/sans/algorithm_detail/batch_execution.py
+++ b/scripts/SANS/sans/algorithm_detail/batch_execution.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from copy import deepcopy
from mantid.api import AnalysisDataService, WorkspaceGroup
diff --git a/scripts/SANS/sans/algorithm_detail/bundles.py b/scripts/SANS/sans/algorithm_detail/bundles.py
index 5965a1c633f..060b58321a7 100644
--- a/scripts/SANS/sans/algorithm_detail/bundles.py
+++ b/scripts/SANS/sans/algorithm_detail/bundles.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" This module contains bundle definitions for passing reduction settings between functions."""
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
# The ReductionSettingBundle contains the information and data for starting a SANSReductionCore reduction.
diff --git a/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py b/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
index cd6b3867176..e951df0c572 100644
--- a/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
+++ b/scripts/SANS/sans/algorithm_detail/calculate_sans_transmission.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.calculate_transmission_helper import (get_detector_id_for_spectrum_number,
get_workspace_indices_for_monitors,
apply_flat_background_correction_to_monitors,
diff --git a/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py b/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
index efcd70d92f9..4a572839bef 100644
--- a/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
+++ b/scripts/SANS/sans/algorithm_detail/calculate_transmission_helper.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.api import ExperimentInfo
from sans.common.general_functions import (create_unmanaged_algorithm, sanitise_instrument_name)
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/calibration.py b/scripts/SANS/sans/algorithm_detail/calibration.py
index dcf9314a218..28bbc8e6ff7 100644
--- a/scripts/SANS/sans/algorithm_detail/calibration.py
+++ b/scripts/SANS/sans/algorithm_detail/calibration.py
@@ -7,7 +7,6 @@
# pylint: disable=invalid-name
""" Handles calibration of SANS workspaces."""
-from __future__ import (absolute_import, division, print_function)
from os.path import (basename, splitext, isfile)
from mantid.api import (AnalysisDataService)
diff --git a/scripts/SANS/sans/algorithm_detail/centre_finder_new.py b/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
index 95546a289d3..178a734c3d7 100644
--- a/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
+++ b/scripts/SANS/sans/algorithm_detail/centre_finder_new.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.simpleapi import CreateEmptyTableWorkspace
from sans.algorithm_detail.batch_execution import (provide_loaded_data, get_reduction_packages)
from sans.common.enums import (SANSDataType, DetectorType)
diff --git a/scripts/SANS/sans/algorithm_detail/convert_to_q.py b/scripts/SANS/sans/algorithm_detail/convert_to_q.py
index 99265932ce4..02d5962afe6 100644
--- a/scripts/SANS/sans/algorithm_detail/convert_to_q.py
+++ b/scripts/SANS/sans/algorithm_detail/convert_to_q.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Converts a workspace from wavelengths to momentum transfer."""
-from __future__ import (absolute_import, division, print_function)
-
from math import sqrt
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/crop_helper.py b/scripts/SANS/sans/algorithm_detail/crop_helper.py
index 9d2d1040535..6ea9b47582d 100644
--- a/scripts/SANS/sans/algorithm_detail/crop_helper.py
+++ b/scripts/SANS/sans/algorithm_detail/crop_helper.py
@@ -7,7 +7,6 @@
# pylint: disable=invalid-name
""" Helpers for CropToComponent for SANS."""
-from __future__ import (absolute_import, division, print_function)
from sans.common.general_functions import convert_instrument_and_detector_type_to_bank_name
from sans.common.enums import SANSInstrument
diff --git a/scripts/SANS/sans/algorithm_detail/load_data.py b/scripts/SANS/sans/algorithm_detail/load_data.py
index 56d940642c0..b31f0e49e16 100644
--- a/scripts/SANS/sans/algorithm_detail/load_data.py
+++ b/scripts/SANS/sans/algorithm_detail/load_data.py
@@ -48,7 +48,6 @@ Adding to the cache(ADS) is supported for the TubeCalibration file.
Reading from the cache is supported for all files. This avoids data reloads if the correct file is already in the
cache.
"""
-from __future__ import (absolute_import, division, print_function)
from abc import (ABCMeta, abstractmethod)
from six import with_metaclass
import os
diff --git a/scripts/SANS/sans/algorithm_detail/mask_functions.py b/scripts/SANS/sans/algorithm_detail/mask_functions.py
index bb1c590978e..1a5220bdf12 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_functions.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_functions.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from collections import (namedtuple, Sequence)
from mantid.py3compat import Enum
diff --git a/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py b/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
index 25d8fe10a5a..f0828ad0f01 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_sans_workspace.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.algorithm_detail.mask_workspace import create_masker
from sans.common.enums import DetectorType
from sans.common.general_functions import append_to_sans_file_tag
diff --git a/scripts/SANS/sans/algorithm_detail/mask_workspace.py b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
index 76cc42e7470..a1d18cbf8f5 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from abc import (ABCMeta, abstractmethod)
from six import with_metaclass
diff --git a/scripts/SANS/sans/algorithm_detail/merge_reductions.py b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
index a030ce0b1d5..ba95fefd8d6 100644
--- a/scripts/SANS/sans/algorithm_detail/merge_reductions.py
+++ b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Merges two reduction types to single reduction"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import (ABCMeta, abstractmethod)
from six import with_metaclass
diff --git a/scripts/SANS/sans/algorithm_detail/move_workspaces.py b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
index 5669572bdf1..37cd5694a91 100644
--- a/scripts/SANS/sans/algorithm_detail/move_workspaces.py
+++ b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-few-public-methods, invalid-name
-from __future__ import (absolute_import, division, print_function)
import math
from mantid.api import MatrixWorkspace
from six import with_metaclass
diff --git a/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py b/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
index 619118e120f..9761a40e4e4 100644
--- a/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
+++ b/scripts/SANS/sans/algorithm_detail/normalize_to_sans_monitor.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" SANSNormalizeToMonitor algorithm calculates the normalization to the monitor."""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.constants import EMPTY_NAME
from sans.common.general_functions import create_unmanaged_algorithm
diff --git a/scripts/SANS/sans/algorithm_detail/save_workspace.py b/scripts/SANS/sans/algorithm_detail/save_workspace.py
index cf76a1b9dad..ba135ebb397 100644
--- a/scripts/SANS/sans/algorithm_detail/save_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/save_workspace.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from collections import namedtuple
from mantid.api import MatrixWorkspace
from mantid.dataobjects import EventWorkspace
diff --git a/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py b/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
index 2204dd86195..d60f89e47df 100644
--- a/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/scale_sans_workspace.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Multiplies a SANS workspace by an absolute scale and divides it by the sample volume. """
-from __future__ import (absolute_import, division, print_function)
-
import math
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/single_execution.py b/scripts/SANS/sans/algorithm_detail/single_execution.py
index c71ae14321c..184f4970c61 100644
--- a/scripts/SANS/sans/algorithm_detail/single_execution.py
+++ b/scripts/SANS/sans/algorithm_detail/single_execution.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import sys
from mantid.kernel import mpisetup
diff --git a/scripts/SANS/sans/algorithm_detail/slice_sans_event.py b/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
index 021f308a1c4..86e727193e0 100644
--- a/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
+++ b/scripts/SANS/sans/algorithm_detail/slice_sans_event.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from SANSUtility import _clean_logs
from mantid.dataobjects import Workspace2D
from sans.common.constants import EMPTY_NAME
diff --git a/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py b/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
index 02962641d2f..3287449d852 100644
--- a/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
+++ b/scripts/SANS/sans/algorithm_detail/strip_end_nans_and_infs.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from math import (isinf, isnan)
from sans.common.constants import EMPTY_NAME
from sans.common.general_functions import create_child_algorithm
diff --git a/scripts/SANS/sans/algorithm_detail/xml_shapes.py b/scripts/SANS/sans/algorithm_detail/xml_shapes.py
index 76d765dcb4e..583bd7001a8 100644
--- a/scripts/SANS/sans/algorithm_detail/xml_shapes.py
+++ b/scripts/SANS/sans/algorithm_detail/xml_shapes.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from math import (pi, cos, sin)
from sans.common.enums import MaskingQuadrant
diff --git a/scripts/SANS/sans/command_interface/ISISCommandInterface.py b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
index f1b85fe7771..3e55da0f30a 100644
--- a/scripts/SANS/sans/command_interface/ISISCommandInterface.py
+++ b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import inspect
import os
import re
diff --git a/scripts/SANS/sans/command_interface/batch_csv_parser.py b/scripts/SANS/sans/command_interface/batch_csv_parser.py
index 64d4417ef0f..f1964f0f0ac 100644
--- a/scripts/SANS/sans/command_interface/batch_csv_parser.py
+++ b/scripts/SANS/sans/command_interface/batch_csv_parser.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import csv
import re
from csv import reader
diff --git a/scripts/SANS/sans/command_interface/command_interface_functions.py b/scripts/SANS/sans/command_interface/command_interface_functions.py
index b1edf7b2299..c5702ed5200 100644
--- a/scripts/SANS/sans/command_interface/command_interface_functions.py
+++ b/scripts/SANS/sans/command_interface/command_interface_functions.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import Logger
diff --git a/scripts/SANS/sans/command_interface/command_interface_state_director.py b/scripts/SANS/sans/command_interface/command_interface_state_director.py
index 4da3b578997..e3ed619390d 100644
--- a/scripts/SANS/sans/command_interface/command_interface_state_director.py
+++ b/scripts/SANS/sans/command_interface/command_interface_state_director.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat import Enum
from sans.common.enums import DataType
from sans.common.file_information import SANSFileInformationFactory
diff --git a/scripts/SANS/sans/common/configurations.py b/scripts/SANS/sans/common/configurations.py
index f1bec969236..db8f10dfdb1 100644
--- a/scripts/SANS/sans/common/configurations.py
+++ b/scripts/SANS/sans/common/configurations.py
@@ -7,9 +7,6 @@
""" The SANSConfigurations class holds instrument-specific configs to centralize instrument-specific magic numbers"""
# pylint: disable=too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
-
class Configurations(object):
class LARMOR(object):
diff --git a/scripts/SANS/sans/common/constants.py b/scripts/SANS/sans/common/constants.py
index 59a36544db0..039bb99d489 100644
--- a/scripts/SANS/sans/common/constants.py
+++ b/scripts/SANS/sans/common/constants.py
@@ -8,8 +8,6 @@
# pylint: disable=too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
-
# ----------------------------------------
# Property names for Algorithms
# ---------------------------------------
diff --git a/scripts/SANS/sans/common/enums.py b/scripts/SANS/sans/common/enums.py
index c02a235de15..3778638b6e7 100644
--- a/scripts/SANS/sans/common/enums.py
+++ b/scripts/SANS/sans/common/enums.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The elements of this module define typed enums which are used in the SANS reduction framework."""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat import Enum
from sans.state.JsonSerializable import json_serializable
diff --git a/scripts/SANS/sans/common/file_information.py b/scripts/SANS/sans/common/file_information.py
index 867102bfe24..5e6c6b36abf 100644
--- a/scripts/SANS/sans/common/file_information.py
+++ b/scripts/SANS/sans/common/file_information.py
@@ -8,7 +8,6 @@
# pylint: disable=too-few-public-methods, invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import h5py as h5
import re
diff --git a/scripts/SANS/sans/common/general_functions.py b/scripts/SANS/sans/common/general_functions.py
index 64da771d430..a44e29072c3 100644
--- a/scripts/SANS/sans/common/general_functions.py
+++ b/scripts/SANS/sans/common/general_functions.py
@@ -8,7 +8,6 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from math import (acos, sqrt, degrees)
import re
from copy import deepcopy
diff --git a/scripts/SANS/sans/common/log_tagger.py b/scripts/SANS/sans/common/log_tagger.py
index 3f44f2d2ccd..365e48ed0e5 100644
--- a/scripts/SANS/sans/common/log_tagger.py
+++ b/scripts/SANS/sans/common/log_tagger.py
@@ -8,7 +8,6 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from hashlib import sha224
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
from six import string_types
diff --git a/scripts/SANS/sans/common/xml_parsing.py b/scripts/SANS/sans/common/xml_parsing.py
index f839d33a25a..34cfc21d718 100644
--- a/scripts/SANS/sans/common/xml_parsing.py
+++ b/scripts/SANS/sans/common/xml_parsing.py
@@ -8,8 +8,6 @@
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
try:
import xml.etree.cElementTree as eTree
except ImportError:
diff --git a/scripts/SANS/sans/gui_logic/models/create_state.py b/scripts/SANS/sans/gui_logic/models/create_state.py
index 3638ddbdb57..3446c03d6a8 100644
--- a/scripts/SANS/sans/gui_logic/models/create_state.py
+++ b/scripts/SANS/sans/gui_logic/models/create_state.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.api import FileFinder
from sans.gui_logic.models.state_gui_model import StateGuiModel
diff --git a/scripts/SANS/sans/gui_logic/models/model_common.py b/scripts/SANS/sans/gui_logic/models/model_common.py
index 805164e0723..46f5bd26a98 100644
--- a/scripts/SANS/sans/gui_logic/models/model_common.py
+++ b/scripts/SANS/sans/gui_logic/models/model_common.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta
from six import with_metaclass
diff --git a/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py b/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
index e0b61e44d3e..647fe72d44b 100644
--- a/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
+++ b/scripts/SANS/sans/gui_logic/models/settings_adjustment_model.py
@@ -10,8 +10,6 @@ This is one of the two models which is used for the data reduction. It contains
are not available in the model associated with the data table.
"""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.enums import SANSInstrument, DataType, FitType, DetectorType
from sans.gui_logic.models.model_common import ModelCommon
from sans.user_file.settings_tags import TransId, MonId, FitId, fit_general, monitor_file
diff --git a/scripts/SANS/sans/gui_logic/models/state_gui_model.py b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
index 844bb1f9b6b..9cc28d593e2 100644
--- a/scripts/SANS/sans/gui_logic/models/state_gui_model.py
+++ b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
@@ -10,8 +10,6 @@ This is one of the two models which is used for the data reduction. It contains
are not available in the model associated with the data table.
"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.py3compat import ensure_str
from sans.common.enums import (ReductionDimensionality, ReductionMode, RangeStepType, SaveType,
DetectorType)
diff --git a/scripts/SANS/sans/gui_logic/models/table_model.py b/scripts/SANS/sans/gui_logic/models/table_model.py
index 8aa5d9e9cd2..bc889409aad 100644
--- a/scripts/SANS/sans/gui_logic/models/table_model.py
+++ b/scripts/SANS/sans/gui_logic/models/table_model.py
@@ -10,8 +10,6 @@ The main information in the table model are the run numbers and the selected per
information regarding the custom output name and the information in the options tab.
"""
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Logger
from sans.common.enums import RowState
from sans.gui_logic.models.RowEntries import RowEntries
diff --git a/scripts/SANS/sans/gui_logic/plotting.py b/scripts/SANS/sans/gui_logic/plotting.py
index 68bb30ede42..a942e2bb635 100644
--- a/scripts/SANS/sans/gui_logic/plotting.py
+++ b/scripts/SANS/sans/gui_logic/plotting.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import)
-
-
def get_plotting_module():
"""
:returns: The plotting module to use. Can be None if Qt is not accessible.
diff --git a/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py b/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
index c91f96f0b53..a69e1b60b45 100644
--- a/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/beam_centre_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import copy
from mantid.kernel import Logger
diff --git a/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py b/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
index 24a8f09f010..02889d8e6c6 100644
--- a/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/diagnostic_presenter.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from mantid.kernel import Logger
from ui.sans_isis.diagnostics_page import DiagnosticsPage
from ui.sans_isis.work_handler import WorkHandler
diff --git a/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py b/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
index 169601fbac7..c31fd97ed3b 100644
--- a/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
+++ b/scripts/SANS/sans/gui_logic/presenter/gui_state_director.py
@@ -10,8 +10,6 @@ The GuiStateDirector gets the information from the table and state model and gen
the main part of the work to an StateDirectorISIS object.
"""
-from __future__ import (absolute_import, division, print_function)
-
import copy
from sans.common.file_information import SANSFileInformationBlank
diff --git a/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py b/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
index a243d1478e5..3061d98e5cf 100644
--- a/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/masking_table_presenter.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The presenter associated with the masking table view. """
-from __future__ import (absolute_import, division, print_function)
-
from collections import namedtuple
import copy
diff --git a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
index 3f250ac1e02..7cb3fd2838e 100644
--- a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
+++ b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
@@ -10,8 +10,6 @@ This abstract class allows other presenters to share functions which set attribu
the view or retrieve them from the view
"""
-from __future__ import (absolute_import, division, print_function)
-
from abc import ABCMeta, abstractmethod
from six import with_metaclass
diff --git a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
index 4fe9f609ce5..e4fd6c0c37d 100644
--- a/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/run_tab_presenter.py
@@ -10,8 +10,6 @@ This presenter is essentially the brain of the reduction gui. It controls other
for presenting and generating the reduction settings.
"""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import os
import time
diff --git a/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py b/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
index a4fc306c303..36da3766239 100644
--- a/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/settings_adjustment_presenter.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
import copy
from sans.common.enums import FitType
diff --git a/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py b/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
index 688106be137..74b476104fe 100644
--- a/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/settings_diagnostic_presenter.py
@@ -5,9 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
-from __future__ import (absolute_import, division, print_function)
-
-
import os
import json
diff --git a/scripts/SANS/sans/sans_batch.py b/scripts/SANS/sans/sans_batch.py
index 1302bca43c2..94cd8f6dd23 100644
--- a/scripts/SANS/sans/sans_batch.py
+++ b/scripts/SANS/sans/sans_batch.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
""" SANBatchReduction algorithm is the starting point for any new type reduction, event single reduction"""
-from __future__ import (absolute_import, division, print_function)
from sans.state.AllStates import AllStates
from sans.algorithm_detail.batch_execution import (single_reduction_for_batch)
from sans.common.enums import (OutputMode, FindDirectionEnum, DetectorType)
diff --git a/scripts/SANS/sans/state/AllStates.py b/scripts/SANS/sans/state/AllStates.py
index cc13dbc0f67..c9c84579356 100644
--- a/scripts/SANS/sans/state/AllStates.py
+++ b/scripts/SANS/sans/state/AllStates.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the main State object."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
diff --git a/scripts/SANS/sans/state/JsonSerializable.py b/scripts/SANS/sans/state/JsonSerializable.py
index 603455249f7..091f462c493 100644
--- a/scripts/SANS/sans/state/JsonSerializable.py
+++ b/scripts/SANS/sans/state/JsonSerializable.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from enum import Enum
diff --git a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
index fb2a638258a..5060c790fd8 100644
--- a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
@@ -8,8 +8,6 @@
"""State describing the adjustment workspace creation of the SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
diff --git a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
index 41940749be6..f9ee0a2d04e 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
@@ -8,7 +8,6 @@
"""State describing the calculation of the transmission for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
import abc
diff --git a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
index e8cffd6825f..118cefcd746 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
@@ -12,7 +12,6 @@
that we are dealing with a bug
"""
-from __future__ import (absolute_import, division, print_function)
import copy
from six import with_metaclass
diff --git a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
index 6084b6019ef..05091709fa0 100644
--- a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
+++ b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
@@ -8,7 +8,6 @@
"""State describing the conversion to momentum transfer"""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateData.py b/scripts/SANS/sans/state/StateObjects/StateData.py
index a4ce9cb3e64..3fbeb4c4d46 100644
--- a/scripts/SANS/sans/state/StateObjects/StateData.py
+++ b/scripts/SANS/sans/state/StateObjects/StateData.py
@@ -7,7 +7,6 @@
# pylint: disable=too-few-public-methods
"""State about the actual data which is to be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
index e5720e82c82..75e21dcbce7 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
@@ -8,7 +8,6 @@
"""State describing the masking behaviour of the SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
index 58e2f6db13d..1217c831d31 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
@@ -8,8 +8,6 @@
"""State for moving workspaces."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
diff --git a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
index 1c3b2bc3d33..7a732d99381 100644
--- a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
+++ b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
@@ -8,7 +8,6 @@
"""State describing the normalization to the incident monitor for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
index 26e42ec18ba..27aa502a57f 100644
--- a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
+++ b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the reduction."""
-from __future__ import (absolute_import, division, print_function)
-
import copy
import json
diff --git a/scripts/SANS/sans/state/StateObjects/StateSave.py b/scripts/SANS/sans/state/StateObjects/StateSave.py
index af2f9a70158..663699996b2 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSave.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSave.py
@@ -8,7 +8,6 @@
""" Defines the state of saving."""
-from __future__ import (absolute_import, division, print_function)
import copy
from six import with_metaclass
diff --git a/scripts/SANS/sans/state/StateObjects/StateScale.py b/scripts/SANS/sans/state/StateObjects/StateScale.py
index 2538e3108c8..e3fd330bc23 100644
--- a/scripts/SANS/sans/state/StateObjects/StateScale.py
+++ b/scripts/SANS/sans/state/StateObjects/StateScale.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the geometry and unit scaling."""
-from __future__ import (absolute_import, division, print_function)
import copy
from six import with_metaclass
diff --git a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
index f9fbb9a8058..b41bc167259 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the event slices which should be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelength.py b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
index 349bca141b5..a5df4085084 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelength.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" Defines the state of the event slices which should be reduced."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
index b358a189a75..443d8212b18 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
@@ -8,7 +8,6 @@
"""State describing the creation of pixel and wavelength adjustment workspaces for SANS reduction."""
-from __future__ import (absolute_import, division, print_function)
import json
import copy
diff --git a/scripts/SANS/sans/state/automatic_setters.py b/scripts/SANS/sans/state/automatic_setters.py
index 07b7b08db26..f132c6f38cd 100644
--- a/scripts/SANS/sans/state/automatic_setters.py
+++ b/scripts/SANS/sans/state/automatic_setters.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from functools import (partial, wraps)
import inspect
diff --git a/scripts/SANS/sans/state/state_functions.py b/scripts/SANS/sans/state/state_functions.py
index f62636079d6..f83f0cf228c 100644
--- a/scripts/SANS/sans/state/state_functions.py
+++ b/scripts/SANS/sans/state/state_functions.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Set of general purpose functions which are related to the SANSState approach."""
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.enums import (DetectorType)
from sans.common.xml_parsing import (get_monitor_names_from_idf_file, get_named_elements_from_ipf_file)
diff --git a/scripts/SANS/sans/test_helper/mock_objects.py b/scripts/SANS/sans/test_helper/mock_objects.py
index c4b275d8a2f..e2ac44219ec 100644
--- a/scripts/SANS/sans/test_helper/mock_objects.py
+++ b/scripts/SANS/sans/test_helper/mock_objects.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import)
-
from functools import (partial)
from six import with_metaclass
diff --git a/scripts/SANS/sans/test_helper/test_director.py b/scripts/SANS/sans/test_helper/test_director.py
index a82aaf1363f..2f217368778 100644
--- a/scripts/SANS/sans/test_helper/test_director.py
+++ b/scripts/SANS/sans/test_helper/test_director.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
""" A Test director """
-from __future__ import (absolute_import, division, print_function)
from sans.state.StateObjects.StateData import get_data_builder
from sans.state.StateObjects.StateMoveDetectors import get_move_builder
from sans.state.StateObjects.StateReductionMode import get_reduction_mode_builder
diff --git a/scripts/SANS/sans/test_helper/user_file_test_helper.py b/scripts/SANS/sans/test_helper/user_file_test_helper.py
index 99467a5006e..66e10dc04be 100644
--- a/scripts/SANS/sans/test_helper/user_file_test_helper.py
+++ b/scripts/SANS/sans/test_helper/user_file_test_helper.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import tempfile
base_user_file = ("PRINT for changer\n"
diff --git a/scripts/SANS/sans/user_file/settings_tags.py b/scripts/SANS/sans/user_file/settings_tags.py
index 37966f394e6..c7ef0d5fd28 100644
--- a/scripts/SANS/sans/user_file/settings_tags.py
+++ b/scripts/SANS/sans/user_file/settings_tags.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from collections import namedtuple
from mantid.py3compat import Enum
diff --git a/scripts/SANS/sans/user_file/user_file_parser.py b/scripts/SANS/sans/user_file/user_file_parser.py
index 49d80d182f9..e4b7618d37e 100644
--- a/scripts/SANS/sans/user_file/user_file_parser.py
+++ b/scripts/SANS/sans/user_file/user_file_parser.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-lines, invalid-name, too-many-instance-attributes, too-many-branches, too-few-public-methods
-from __future__ import (absolute_import, division, print_function)
import abc
import re
from math import copysign
diff --git a/scripts/SANS/sans/user_file/user_file_reader.py b/scripts/SANS/sans/user_file/user_file_reader.py
index 9641f2e638c..25ea4e1a1c8 100644
--- a/scripts/SANS/sans/user_file/user_file_reader.py
+++ b/scripts/SANS/sans/user_file/user_file_reader.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from sans.common.file_information import find_full_file_path
from sans.user_file.user_file_parser import UserFileParser
diff --git a/scripts/SCD_Reduction/BVGFitTools.py b/scripts/SCD_Reduction/BVGFitTools.py
index 20afbd64d45..8a8ae09f222 100644
--- a/scripts/SCD_Reduction/BVGFitTools.py
+++ b/scripts/SCD_Reduction/BVGFitTools.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import matplotlib.pyplot as plt
import ICCFitTools as ICCFT
diff --git a/scripts/SCD_Reduction/ICCFitTools.py b/scripts/SCD_Reduction/ICCFitTools.py
index 333bbee8676..b566fabe9f8 100644
--- a/scripts/SCD_Reduction/ICCFitTools.py
+++ b/scripts/SCD_Reduction/ICCFitTools.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import matplotlib.pyplot as plt
import numpy as np
import sys
diff --git a/scripts/SCD_Reduction/ReduceDictionary.py b/scripts/SCD_Reduction/ReduceDictionary.py
index f9a1615947f..4f906666744 100644
--- a/scripts/SCD_Reduction/ReduceDictionary.py
+++ b/scripts/SCD_Reduction/ReduceDictionary.py
@@ -19,9 +19,6 @@
# The run numbers themselves may be specified as a comma separated list of
# individual run numbers, or ranges specified with a colon separator.
#
-from __future__ import (absolute_import, division, print_function)
-
-
def LoadDictionary( *filenames, **kwargs ):
# create a dictionary to load into
params_dictionary = kwargs.get("existing", {})
diff --git a/scripts/SCD_Reduction/ReduceSCD_OneRun.py b/scripts/SCD_Reduction/ReduceSCD_OneRun.py
index d35a0e36268..7f326ba5657 100644
--- a/scripts/SCD_Reduction/ReduceSCD_OneRun.py
+++ b/scripts/SCD_Reduction/ReduceSCD_OneRun.py
@@ -41,7 +41,6 @@
# the use of either monitor counts (True) or proton charge (False) for
# scaling.
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/SCD_Reduction/ReduceSCD_Parallel.py b/scripts/SCD_Reduction/ReduceSCD_Parallel.py
index 0704b04f9ba..b4bd6f57a6a 100644
--- a/scripts/SCD_Reduction/ReduceSCD_Parallel.py
+++ b/scripts/SCD_Reduction/ReduceSCD_Parallel.py
@@ -40,7 +40,6 @@
# run or the loaded matirix instead of the default FFT method
#
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import threading
diff --git a/scripts/SCD_Reduction/SCDCalibratePanelsResults.py b/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
index 1d894a8ce84..bdddb5f7fbb 100755
--- a/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
+++ b/scripts/SCD_Reduction/SCDCalibratePanelsResults.py
@@ -10,7 +10,6 @@ Plot data in SCDcalib.log file from Mantid SCD Calibration.
A. J. Schultz, V. E. Lynch, August 2015
"""
-from __future__ import (absolute_import, division, print_function)
import pylab
import os
import math
diff --git a/scripts/SliceViewAnimator.py b/scripts/SliceViewAnimator.py
index c965c4f64ea..8cc2701b200 100644
--- a/scripts/SliceViewAnimator.py
+++ b/scripts/SliceViewAnimator.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=too-many-arguments
-from __future__ import (absolute_import, division, print_function)
import numpy
from wand.image import Image
from wand.drawing import Drawing
diff --git a/scripts/TemporaryREF_MScripts/testCenterREF_M.py b/scripts/TemporaryREF_MScripts/testCenterREF_M.py
index 9eae563e353..84cd1881356 100644
--- a/scripts/TemporaryREF_MScripts/testCenterREF_M.py
+++ b/scripts/TemporaryREF_MScripts/testCenterREF_M.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import numpy as np
import mantid
diff --git a/scripts/TofConverter.py b/scripts/TofConverter.py
index 315bd032a03..b3771cf72ff 100644
--- a/scripts/TofConverter.py
+++ b/scripts/TofConverter.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from TofConverter import converterGUI
from mantidqt.gui_helper import get_qapplication
diff --git a/scripts/TofConverter/convertUnits.py b/scripts/TofConverter/convertUnits.py
index 1c916c6d3ee..de2fddb9e87 100644
--- a/scripts/TofConverter/convertUnits.py
+++ b/scripts/TofConverter/convertUnits.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-branches
-from __future__ import (absolute_import, division, print_function)
import math
# Used by converter GUI to do unit conversions
diff --git a/scripts/TofConverter/converterGUI.py b/scripts/TofConverter/converterGUI.py
index 6e2de610d9f..44c95ca0433 100644
--- a/scripts/TofConverter/converterGUI.py
+++ b/scripts/TofConverter/converterGUI.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from qtpy.QtWidgets import QMainWindow, QMessageBox
from qtpy.QtGui import QDoubleValidator
from qtpy import QtCore
diff --git a/scripts/Vates/SXD_NaCl.py b/scripts/Vates/SXD_NaCl.py
index f70465c2f88..38b3c6f5051 100644
--- a/scripts/Vates/SXD_NaCl.py
+++ b/scripts/Vates/SXD_NaCl.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as mantid
diff --git a/scripts/directtools/__init__.py b/scripts/directtools/__init__.py
index b52c44adb2f..987286546ad 100644
--- a/scripts/directtools/__init__.py
+++ b/scripts/directtools/__init__.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import collections
from directtools import _validate
from mantid import logger, mtd
diff --git a/scripts/directtools/_validate.py b/scripts/directtools/_validate.py
index 72d67a16ce1..76cbaf2978f 100644
--- a/scripts/directtools/_validate.py
+++ b/scripts/directtools/_validate.py
@@ -4,9 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
-
def _isDOS(workspace):
"""Return True if workspace looks like a valid DOS workspace, False otherwise."""
singleHistogram = workspace.getNumberHistograms() == 1
diff --git a/scripts/pythonTSV.py b/scripts/pythonTSV.py
index 4143018b2d1..d422e447dfb 100644
--- a/scripts/pythonTSV.py
+++ b/scripts/pythonTSV.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
"""
Some simple helpers for dealing with the TSV
"""
diff --git a/scripts/reducer_singleton.py b/scripts/reducer_singleton.py
index e259d5dcd56..bd3ca52725b 100644
--- a/scripts/reducer_singleton.py
+++ b/scripts/reducer_singleton.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import random
import string
import os
diff --git a/scripts/reduction/__init__.py b/scripts/reduction/__init__.py
index 65c20f65fb3..4b9ad48081b 100644
--- a/scripts/reduction/__init__.py
+++ b/scripts/reduction/__init__.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from reduction.reducer import * # noqa: F401
from reduction.instrument import * # noqa: F401
from reduction.find_data import find_data, find_file # noqa: F401
diff --git a/scripts/reduction/command_interface.py b/scripts/reduction/command_interface.py
index d8cfa7f3377..a749ca08d1e 100644
--- a/scripts/reduction/command_interface.py
+++ b/scripts/reduction/command_interface.py
@@ -8,7 +8,6 @@
"""
List of user commands.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction.reducer import Reducer
diff --git a/scripts/reduction/find_data.py b/scripts/reduction/find_data.py
index 3adb286336d..dbd1d790917 100644
--- a/scripts/reduction/find_data.py
+++ b/scripts/reduction/find_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,redefined-builtin
-from __future__ import (absolute_import, division, print_function)
import os
import mantid.api as api
from mantid.simpleapi import *
diff --git a/scripts/reduction/instrument.py b/scripts/reduction/instrument.py
index 0431e867eab..108112ed447 100644
--- a/scripts/reduction/instrument.py
+++ b/scripts/reduction/instrument.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as api
from mantid.kernel import *
from mantid.api import *
diff --git a/scripts/reduction/instruments/example/ExampleRedStep.py b/scripts/reduction/instruments/example/ExampleRedStep.py
index 574f12ae117..299931bd81e 100644
--- a/scripts/reduction/instruments/example/ExampleRedStep.py
+++ b/scripts/reduction/instruments/example/ExampleRedStep.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from __future__ import (absolute_import, division, print_function)
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
diff --git a/scripts/reduction/instruments/example/example_reducer.py b/scripts/reduction/instruments/example/example_reducer.py
index f26589d176d..ae9d46df302 100644
--- a/scripts/reduction/instruments/example/example_reducer.py
+++ b/scripts/reduction/instruments/example/example_reducer.py
@@ -8,7 +8,6 @@
"""
Simple Reducer example
"""
-from __future__ import (absolute_import, division, print_function)
from reduction import Reducer
from reduction.instruments.example.ExampleRedStep import ExampleRedStep
# Validate_step is a decorator that allows both Python algorithms and ReductionStep objects to be passed to the Reducer.
diff --git a/scripts/reduction/instruments/inelastic/direct_command_interface.py b/scripts/reduction/instruments/inelastic/direct_command_interface.py
index 243e1d710e3..8320b1700c3 100644
--- a/scripts/reduction/instruments/inelastic/direct_command_interface.py
+++ b/scripts/reduction/instruments/inelastic/direct_command_interface.py
@@ -8,7 +8,6 @@
"""
Command set for Direct Geometry reduction
"""
-from __future__ import (absolute_import, division, print_function)
# Import the specific commands that we need
from mantid.api import AlgorithmManager
from reduction.command_interface import *
diff --git a/scripts/reduction/instruments/sans/sans_reducer.py b/scripts/reduction/instruments/sans/sans_reducer.py
index e304c2820a1..f7c5b9cc908 100644
--- a/scripts/reduction/instruments/sans/sans_reducer.py
+++ b/scripts/reduction/instruments/sans/sans_reducer.py
@@ -9,7 +9,6 @@
a predefined set of reduction steps to be followed. The actual ReductionStep objects
executed for each of those steps can be modified.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction import Reducer
from reduction import ReductionStep
from reduction import validate_step
diff --git a/scripts/reduction/instruments/sans/sans_reduction_steps.py b/scripts/reduction/instruments/sans/sans_reduction_steps.py
index 122e3f1351e..e7e44ab53dc 100644
--- a/scripts/reduction/instruments/sans/sans_reduction_steps.py
+++ b/scripts/reduction/instruments/sans/sans_reduction_steps.py
@@ -8,7 +8,6 @@
"""
Implementation of reduction steps for SANS
"""
-from __future__ import (absolute_import, division, print_function)
import math
import pickle
from reduction import ReductionStep
diff --git a/scripts/reduction/reducer.py b/scripts/reduction/reducer.py
index f38d48478d5..76c7527a194 100644
--- a/scripts/reduction/reducer.py
+++ b/scripts/reduction/reducer.py
@@ -26,7 +26,6 @@
instrument settings.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/reduction_workflow/command_interface.py b/scripts/reduction_workflow/command_interface.py
index 18172a08d2d..9e0a9b50a4a 100644
--- a/scripts/reduction_workflow/command_interface.py
+++ b/scripts/reduction_workflow/command_interface.py
@@ -8,7 +8,6 @@
"""
List of user commands.
"""
-from __future__ import (absolute_import, division, print_function)
from reduction_workflow.reducer import Reducer
diff --git a/scripts/reduction_workflow/find_data.py b/scripts/reduction_workflow/find_data.py
index c36f23c8c87..2d5b7e41bd2 100644
--- a/scripts/reduction_workflow/find_data.py
+++ b/scripts/reduction_workflow/find_data.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
-
import os
from mantid.kernel import ConfigService, Logger
from mantid.api import FileFinder
diff --git a/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py b/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
index 05e5ce484c3..6138a7c8344 100644
--- a/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
+++ b/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py
@@ -10,7 +10,6 @@
List of common user commands for HFIR SANS
"""
-from __future__ import (absolute_import, division, print_function)
import os.path
import mantid
diff --git a/scripts/reduction_workflow/instruments/sans/hfir_instrument.py b/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
index b2963de1eb1..ae4cf028477 100644
--- a/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
+++ b/scripts/reduction_workflow/instruments/sans/hfir_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-arguments,too-many-branches
-from __future__ import (absolute_import, division, print_function)
import sys
from mantid.kernel import Logger
diff --git a/scripts/reduction_workflow/instruments/sans/sns_command_interface.py b/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
index 1928f771ada..4f2da87420a 100644
--- a/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
+++ b/scripts/reduction_workflow/instruments/sans/sns_command_interface.py
@@ -9,7 +9,6 @@
Command set for EQSANS reduction
"""
# Import the specific commands that we need - some of these are used in systemtests
-from __future__ import (absolute_import, division, print_function)
from reduction_workflow.command_interface import *
# The following imports allow users to import this file and have all functionality automatically imported
diff --git a/scripts/reduction_workflow/instruments/sans/sns_instrument.py b/scripts/reduction_workflow/instruments/sans/sns_instrument.py
index fa4af710cd4..3a7af9acad9 100644
--- a/scripts/reduction_workflow/instruments/sans/sns_instrument.py
+++ b/scripts/reduction_workflow/instruments/sans/sns_instrument.py
@@ -8,8 +8,6 @@
"""
Instrument-specific utility functions for EQSANS
"""
-from __future__ import (absolute_import, division, print_function)
-
from .hfir_instrument import _get_pixel_info
diff --git a/scripts/reduction_workflow/reducer.py b/scripts/reduction_workflow/reducer.py
index 4dc396f5ded..72f93e9ef7b 100644
--- a/scripts/reduction_workflow/reducer.py
+++ b/scripts/reduction_workflow/reducer.py
@@ -8,7 +8,6 @@
"""
Base reduction class. Uses version 2 python API.
"""
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import time
diff --git a/scripts/test/Abins/AbinsAtomsDataTest.py b/scripts/test/Abins/AbinsAtomsDataTest.py
index bafa00118b7..ac446dd261d 100644
--- a/scripts/test/Abins/AbinsAtomsDataTest.py
+++ b/scripts/test/Abins/AbinsAtomsDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsBroadeningTest.py b/scripts/test/Abins/AbinsBroadeningTest.py
index 05518c4e0ec..2e96b95116e 100644
--- a/scripts/test/Abins/AbinsBroadeningTest.py
+++ b/scripts/test/Abins/AbinsBroadeningTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
diff --git a/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py b/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
index 3b5ab0d2f02..6066f59e748 100644
--- a/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
+++ b/scripts/test/Abins/AbinsCalculateDWSingleCrystalTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import *
import numpy as np
diff --git a/scripts/test/Abins/AbinsCalculatePowderTest.py b/scripts/test/Abins/AbinsCalculatePowderTest.py
index 4e0bc672014..6b56766a25e 100644
--- a/scripts/test/Abins/AbinsCalculatePowderTest.py
+++ b/scripts/test/Abins/AbinsCalculatePowderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsCalculateQToscaTest.py b/scripts/test/Abins/AbinsCalculateQToscaTest.py
index e6114a52921..de2cd0637aa 100644
--- a/scripts/test/Abins/AbinsCalculateQToscaTest.py
+++ b/scripts/test/Abins/AbinsCalculateQToscaTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import *
diff --git a/scripts/test/Abins/AbinsCalculateSPowderTest.py b/scripts/test/Abins/AbinsCalculateSPowderTest.py
index ba6eebedeb7..455801eb666 100644
--- a/scripts/test/Abins/AbinsCalculateSPowderTest.py
+++ b/scripts/test/Abins/AbinsCalculateSPowderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import json
diff --git a/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py b/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
index 052f162000f..caa137c224b 100644
--- a/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
+++ b/scripts/test/Abins/AbinsCalculateSingleCrystalTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py b/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
index bfd0d1659b3..dfa632d6fd1 100644
--- a/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
+++ b/scripts/test/Abins/AbinsDWSingleCrystalDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
index 7438a48bf87..6e1338ed650 100644
--- a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
+++ b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from itertools import product
import unittest
diff --git a/scripts/test/Abins/AbinsIOmoduleTest.py b/scripts/test/Abins/AbinsIOmoduleTest.py
index f4a60685fcd..863012ac12e 100644
--- a/scripts/test/Abins/AbinsIOmoduleTest.py
+++ b/scripts/test/Abins/AbinsIOmoduleTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-
-from __future__ import (absolute_import, division, print_function)
import six
import unittest
import numpy as np
diff --git a/scripts/test/Abins/AbinsInstrumentTest.py b/scripts/test/Abins/AbinsInstrumentTest.py
index c64f269d667..da7da5353a1 100644
--- a/scripts/test/Abins/AbinsInstrumentTest.py
+++ b/scripts/test/Abins/AbinsInstrumentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from AbinsModules.Instruments.Instrument import Instrument
diff --git a/scripts/test/Abins/AbinsKpointsDataTest.py b/scripts/test/Abins/AbinsKpointsDataTest.py
index f6aee35c9ed..ae553c6d022 100644
--- a/scripts/test/Abins/AbinsKpointsDataTest.py
+++ b/scripts/test/Abins/AbinsKpointsDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
from mantid.simpleapi import logger
diff --git a/scripts/test/Abins/AbinsLoadCASTEPTest.py b/scripts/test/Abins/AbinsLoadCASTEPTest.py
index c44ca86abd5..a50fc7bccff 100644
--- a/scripts/test/Abins/AbinsLoadCASTEPTest.py
+++ b/scripts/test/Abins/AbinsLoadCASTEPTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid # has to be imported so that AbinsModules can be found
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadCRYSTALTest.py b/scripts/test/Abins/AbinsLoadCRYSTALTest.py
index d14985b291c..c3a8a0433e3 100644
--- a/scripts/test/Abins/AbinsLoadCRYSTALTest.py
+++ b/scripts/test/Abins/AbinsLoadCRYSTALTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadDMOL3Test.py b/scripts/test/Abins/AbinsLoadDMOL3Test.py
index 56d0d2d752f..cd5b6ac56ed 100644
--- a/scripts/test/Abins/AbinsLoadDMOL3Test.py
+++ b/scripts/test/Abins/AbinsLoadDMOL3Test.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import AbinsModules
diff --git a/scripts/test/Abins/AbinsLoadGAUSSIANTest.py b/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
index 54fba2e5e8e..981996ee1bb 100644
--- a/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
+++ b/scripts/test/Abins/AbinsLoadGAUSSIANTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import AbinsModules
diff --git a/scripts/test/Abins/AbinsPowderDataTest.py b/scripts/test/Abins/AbinsPowderDataTest.py
index 684213c4525..657548010e3 100644
--- a/scripts/test/Abins/AbinsPowderDataTest.py
+++ b/scripts/test/Abins/AbinsPowderDataTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import logger
import numpy as np
diff --git a/scripts/test/Abins/AbinsSDataTest.py b/scripts/test/Abins/AbinsSDataTest.py
index 7b842e166b9..b12e16257f8 100644
--- a/scripts/test/Abins/AbinsSDataTest.py
+++ b/scripts/test/Abins/AbinsSDataTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import six
import unittest
import numpy as np
diff --git a/scripts/test/AbsorptionShapesTest.py b/scripts/test/AbsorptionShapesTest.py
index 7d82a9ea976..0c222317ec8 100644
--- a/scripts/test/AbsorptionShapesTest.py
+++ b/scripts/test/AbsorptionShapesTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/CrystalFieldTest.py b/scripts/test/CrystalFieldTest.py
index 9dfd62ff6ed..af5301c7993 100644
--- a/scripts/test/CrystalFieldTest.py
+++ b/scripts/test/CrystalFieldTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
"""Test suite for the crystal field calculations in the Inelastic/CrystalField package
"""
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy as np
import re
diff --git a/scripts/test/DirectEnergyConversionTest.py b/scripts/test/DirectEnergyConversionTest.py
index 52d624d8745..9e302c44c02 100644
--- a/scripts/test/DirectEnergyConversionTest.py
+++ b/scripts/test/DirectEnergyConversionTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os, sys
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/DirectPropertyManagerTest.py b/scripts/test/DirectPropertyManagerTest.py
index ebf9bdafc36..e158e1ed180 100644
--- a/scripts/test/DirectPropertyManagerTest.py
+++ b/scripts/test/DirectPropertyManagerTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/DirectPropertyManater_OldInterfaceXest.py b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
index 15edc3ea68c..0e3f5ba7941 100644
--- a/scripts/test/DirectPropertyManater_OldInterfaceXest.py
+++ b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
from mantid.simpleapi import *
import unittest
diff --git a/scripts/test/DirectReductionHelpersTest.py b/scripts/test/DirectReductionHelpersTest.py
index 14f822d5c09..865d81e3c27 100644
--- a/scripts/test/DirectReductionHelpersTest.py
+++ b/scripts/test/DirectReductionHelpersTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/ISISDirecInelasticConfigTest.py b/scripts/test/ISISDirecInelasticConfigTest.py
index d7fc87b91b0..34aefcd5732 100644
--- a/scripts/test/ISISDirecInelasticConfigTest.py
+++ b/scripts/test/ISISDirecInelasticConfigTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import unittest
diff --git a/scripts/test/Muon/MaxEntPresenter_test.py b/scripts/test/Muon/MaxEntPresenter_test.py
index ae0a3d52a1d..4cd9d797175 100644
--- a/scripts/test/Muon/MaxEntPresenter_test.py
+++ b/scripts/test/Muon/MaxEntPresenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/PlottingView_test.py b/scripts/test/Muon/PlottingView_test.py
index 6bcdb06e5ec..53ecd1116e7 100644
--- a/scripts/test/Muon/PlottingView_test.py
+++ b/scripts/test/Muon/PlottingView_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import sys
import unittest
diff --git a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
index 73690b9f55b..23c2cd7408e 100644
--- a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/elemental_analysis/lmodel_test.py b/scripts/test/Muon/elemental_analysis/lmodel_test.py
index 5170a980883..8de0ec2f4a8 100644
--- a/scripts/test/Muon/elemental_analysis/lmodel_test.py
+++ b/scripts/test/Muon/elemental_analysis/lmodel_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, unicode_literals)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/fit_information_test.py b/scripts/test/Muon/fit_information_test.py
index 66068b820e3..65acee7de12 100644
--- a/scripts/test/Muon/fit_information_test.py
+++ b/scripts/test/Muon/fit_information_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import unittest
from mantid.api import AnalysisDataService, WorkspaceFactory
diff --git a/scripts/test/Muon/fit_parameters_test.py b/scripts/test/Muon/fit_parameters_test.py
index 947a2d2ad3c..50e6a45723d 100644
--- a/scripts/test/Muon/fit_parameters_test.py
+++ b/scripts/test/Muon/fit_parameters_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from collections import OrderedDict
import unittest
diff --git a/scripts/test/Muon/fitting_context_test.py b/scripts/test/Muon/fitting_context_test.py
index b165ebd9db6..f126a63ccdd 100644
--- a/scripts/test/Muon/fitting_context_test.py
+++ b/scripts/test/Muon/fitting_context_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
from collections import OrderedDict
import unittest
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/scripts/test/Muon/frequency_domain_context_test.py b/scripts/test/Muon/frequency_domain_context_test.py
index 7355d5a9730..ecffd665cf9 100644
--- a/scripts/test/Muon/frequency_domain_context_test.py
+++ b/scripts/test/Muon/frequency_domain_context_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import six
import sys
import unittest
diff --git a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
index c8f17ec62ef..9ccda4c0f60 100644
--- a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
+++ b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FileFinder
diff --git a/scripts/test/Muon/muon_gui_context_test.py b/scripts/test/Muon/muon_gui_context_test.py
index 31d479c5431..30ecbfd3e39 100644
--- a/scripts/test/Muon/muon_gui_context_test.py
+++ b/scripts/test/Muon/muon_gui_context_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, unicode_literals)
-
import sys
import unittest
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
index f5fd29855c4..39e2c149dc4 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from __future__ import (absolute_import, print_function, unicode_literals)
-
from collections import OrderedDict
from copy import deepcopy
import datetime
diff --git a/scripts/test/Muon/utilities/muon_load_data_test.py b/scripts/test/Muon/utilities/muon_load_data_test.py
index 8562ecd0364..89599906abc 100644
--- a/scripts/test/Muon/utilities/muon_load_data_test.py
+++ b/scripts/test/Muon/utilities/muon_load_data_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
index 3fe2696e962..c5b835c2563 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_directory_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi as simpleapi
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
index 8fc91086fa1..947e1ea670a 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import six
diff --git a/scripts/test/ReductionWrapperTest.py b/scripts/test/ReductionWrapperTest.py
index da744f22756..85de738d5f0 100644
--- a/scripts/test/ReductionWrapperTest.py
+++ b/scripts/test/ReductionWrapperTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os,sys
from mantid.simpleapi import *
diff --git a/scripts/test/ReflectometryQuickAuxiliaryTest.py b/scripts/test/ReflectometryQuickAuxiliaryTest.py
index d022db02487..28d07d86c8a 100644
--- a/scripts/test/ReflectometryQuickAuxiliaryTest.py
+++ b/scripts/test/ReflectometryQuickAuxiliaryTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import numpy
from mantid.simpleapi import *
diff --git a/scripts/test/RunDescriptorTest.py b/scripts/test/RunDescriptorTest.py
index b19b56ddbfa..bbe774e0631 100644
--- a/scripts/test/RunDescriptorTest.py
+++ b/scripts/test/RunDescriptorTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import os,sys,inspect
from mantid.simpleapi import *
from mantid import api
diff --git a/scripts/test/SANS/algorithm_detail/batch_execution_test.py b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
index 61be4dd7e89..f4f3eaba284 100644
--- a/scripts/test/SANS/algorithm_detail/batch_execution_test.py
+++ b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py b/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
index b9f060ef1f5..86c537c512a 100644
--- a/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
+++ b/scripts/test/SANS/algorithm_detail/calculate_sans_transmission_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py b/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
index 80e0387948f..a0e17a954ff 100644
--- a/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
+++ b/scripts/test/SANS/algorithm_detail/calculate_transmission_helper_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
index 69380d5f545..5190b3392d4 100644
--- a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
+++ b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/algorithm_detail/convert_to_q_test.py b/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
index de9efbed3b6..bb66b69399a 100644
--- a/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
+++ b/scripts/test/SANS/algorithm_detail/convert_to_q_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import DeleteWorkspace
diff --git a/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py b/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
index 02bd80f13a7..1d018ff39a2 100644
--- a/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
+++ b/scripts/test/SANS/algorithm_detail/create_sans_adjustment_workspaces_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.simpleapi import CreateSampleWorkspace, CloneWorkspace, Load, Rebin
diff --git a/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py b/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
index 610a44c77fa..20177caab95 100644
--- a/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
+++ b/scripts/test/SANS/algorithm_detail/create_sans_wavelength_pixel_adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import numpy as np
import os
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/crop_helper_test.py b/scripts/test/SANS/algorithm_detail/crop_helper_test.py
index b55e8e1f400..ca9df6248e5 100644
--- a/scripts/test/SANS/algorithm_detail/crop_helper_test.py
+++ b/scripts/test/SANS/algorithm_detail/crop_helper_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import FileFinder
diff --git a/scripts/test/SANS/algorithm_detail/merge_reductions_test.py b/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
index f4be8a8351f..2396dc7c17b 100644
--- a/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
+++ b/scripts/test/SANS/algorithm_detail/merge_reductions_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.algorithm_detail.bundles import OutputPartsBundle
diff --git a/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py b/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
index f214c9accb1..d7076a810e4 100644
--- a/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
+++ b/scripts/test/SANS/algorithm_detail/move_sans_instrument_component_test.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import (Quat, V3D)
diff --git a/scripts/test/SANS/algorithm_detail/move_workspaces_test.py b/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
index 726329c05a5..ae4b8692ac2 100644
--- a/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
+++ b/scripts/test/SANS/algorithm_detail/move_workspaces_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
import mantid.simpleapi
diff --git a/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py b/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
index 11698b4d651..59d3c26b8f1 100644
--- a/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
+++ b/scripts/test/SANS/algorithm_detail/normalize_to_sans_monitor_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService
diff --git a/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py b/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
index e3c56a8840c..c2271d8a46d 100644
--- a/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
+++ b/scripts/test/SANS/algorithm_detail/sans_slice_event_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.dataobjects import Workspace2D
diff --git a/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py b/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
index d24ad7961bf..2feeb5f06aa 100644
--- a/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
+++ b/scripts/test/SANS/algorithm_detail/scale_sans_workspace_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import math
import unittest
diff --git a/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py b/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
index cbc3b81c3d9..64efcf849b1 100644
--- a/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
+++ b/scripts/test/SANS/algorithm_detail/strip_end_nans_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FrameworkManager
diff --git a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
index cac6b5b9594..d5b9ae8fbe5 100644
--- a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
+++ b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANS/command_interface/command_interface_state_director_test.py b/scripts/test/SANS/command_interface/command_interface_state_director_test.py
index 0aa3a53b81e..49b51b194ef 100644
--- a/scripts/test/SANS/command_interface/command_interface_state_director_test.py
+++ b/scripts/test/SANS/command_interface/command_interface_state_director_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.command_interface.command_interface_state_director import (NParameterCommand, NParameterCommandId,
diff --git a/scripts/test/SANS/common/file_information_test.py b/scripts/test/SANS/common/file_information_test.py
index 897435d2048..ddc96b8acea 100644
--- a/scripts/test/SANS/common/file_information_test.py
+++ b/scripts/test/SANS/common/file_information_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
diff --git a/scripts/test/SANS/common/general_functions_test.py b/scripts/test/SANS/common/general_functions_test.py
index 12a68beb860..2a3446024b0 100644
--- a/scripts/test/SANS/common/general_functions_test.py
+++ b/scripts/test/SANS/common/general_functions_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AnalysisDataService, FrameworkManager
diff --git a/scripts/test/SANS/common/log_tagger_test.py b/scripts/test/SANS/common/log_tagger_test.py
index 8c51519ff62..45fe26fd041 100644
--- a/scripts/test/SANS/common/log_tagger_test.py
+++ b/scripts/test/SANS/common/log_tagger_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.api import AlgorithmManager, FrameworkManager
diff --git a/scripts/test/SANS/common/xml_parsing_test.py b/scripts/test/SANS/common/xml_parsing_test.py
index 88cb19776b1..7f2f84b48ea 100644
--- a/scripts/test/SANS/common/xml_parsing_test.py
+++ b/scripts/test/SANS/common/xml_parsing_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import DateAndTime
diff --git a/scripts/test/SANS/gui_logic/batch_process_runner_test.py b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
index 23b26e0f3cb..81f8fe7b353 100644
--- a/scripts/test/SANS/gui_logic/batch_process_runner_test.py
+++ b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from qtpy.QtCore import QThreadPool
diff --git a/scripts/test/SANS/gui_logic/beam_centre_model_test.py b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
index ba804546e68..1ab0bbfbb06 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_model_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
index 28dcdd74fd6..e2299976cb2 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/create_state_test.py b/scripts/test/SANS/gui_logic/create_state_test.py
index 7f2b7126bc0..a94acbd638a 100644
--- a/scripts/test/SANS/gui_logic/create_state_test.py
+++ b/scripts/test/SANS/gui_logic/create_state_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py b/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
index 6e270a4ee83..7f28064b00a 100644
--- a/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
+++ b/scripts/test/SANS/gui_logic/diagnostics_page_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import SANSFacility
diff --git a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
index 04c7d9d33a7..78c8b2f581c 100644
--- a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/gui_common_test.py b/scripts/test/SANS/gui_logic/gui_common_test.py
index 00feccb4b84..673eca72545 100644
--- a/scripts/test/SANS/gui_logic/gui_common_test.py
+++ b/scripts/test/SANS/gui_logic/gui_common_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/gui_state_director_test.py b/scripts/test/SANS/gui_logic/gui_state_director_test.py
index 5f9bd10dd46..87b3696e4f7 100644
--- a/scripts/test/SANS/gui_logic/gui_state_director_test.py
+++ b/scripts/test/SANS/gui_logic/gui_state_director_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
index a386998af70..685dd05722a 100644
--- a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.py3compat import mock
diff --git a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
index acefe8b09c8..78e0fb12154 100644
--- a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid.kernel import PropertyManagerDataService
diff --git a/scripts/test/SANS/gui_logic/save_other_presenter_test.py b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
index 76d932e3004..54dec859637 100644
--- a/scripts/test/SANS/gui_logic/save_other_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from mantid import ConfigService
diff --git a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
index e2e39cf0980..4cbf51f7e09 100644
--- a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import json
import os
import tempfile
diff --git a/scripts/test/SANS/gui_logic/state_gui_model_test.py b/scripts/test/SANS/gui_logic/state_gui_model_test.py
index 165dce58d29..c711459b71b 100644
--- a/scripts/test/SANS/gui_logic/state_gui_model_test.py
+++ b/scripts/test/SANS/gui_logic/state_gui_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionDimensionality, ReductionMode, RangeStepType, SampleShape, SaveType,
diff --git a/scripts/test/SANS/gui_logic/table_model_test.py b/scripts/test/SANS/gui_logic/table_model_test.py
index 1e589a642e2..327cf168ed5 100644
--- a/scripts/test/SANS/gui_logic/table_model_test.py
+++ b/scripts/test/SANS/gui_logic/table_model_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import RowState
diff --git a/scripts/test/SANS/state/JsonSerializerTest.py b/scripts/test/SANS/state/JsonSerializerTest.py
index 069537451ab..10e3b44573f 100644
--- a/scripts/test/SANS/state/JsonSerializerTest.py
+++ b/scripts/test/SANS/state/JsonSerializerTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from six import with_metaclass
diff --git a/scripts/test/SANS/state/adjustment_test.py b/scripts/test/SANS/state/adjustment_test.py
index 05baee5dd61..77d0150efe0 100644
--- a/scripts/test/SANS/state/adjustment_test.py
+++ b/scripts/test/SANS/state/adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/calculate_transmission_test.py b/scripts/test/SANS/state/calculate_transmission_test.py
index 0c96dfb22b7..7dcbb41257f 100644
--- a/scripts/test/SANS/state/calculate_transmission_test.py
+++ b/scripts/test/SANS/state/calculate_transmission_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/convert_to_q_test.py b/scripts/test/SANS/state/convert_to_q_test.py
index 00a2d5e4962..0f9e2a5893d 100644
--- a/scripts/test/SANS/state/convert_to_q_test.py
+++ b/scripts/test/SANS/state/convert_to_q_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RangeStepType, ReductionDimensionality, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/data_test.py b/scripts/test/SANS/state/data_test.py
index 1c65c4ffac3..813def2e758 100644
--- a/scripts/test/SANS/state/data_test.py
+++ b/scripts/test/SANS/state/data_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/mask_test.py b/scripts/test/SANS/state/mask_test.py
index 41f6fcd8e00..0383088e365 100644
--- a/scripts/test/SANS/state/mask_test.py
+++ b/scripts/test/SANS/state/mask_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, DetectorType)
diff --git a/scripts/test/SANS/state/move_test.py b/scripts/test/SANS/state/move_test.py
index f972ec4e3dc..dea9d9bcc7d 100644
--- a/scripts/test/SANS/state/move_test.py
+++ b/scripts/test/SANS/state/move_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (CanonicalCoordinates, SANSFacility, DetectorType, SANSInstrument)
diff --git a/scripts/test/SANS/state/normalize_to_monitor_test.py b/scripts/test/SANS/state/normalize_to_monitor_test.py
index 08f469a3738..7f6fdb15a51 100644
--- a/scripts/test/SANS/state/normalize_to_monitor_test.py
+++ b/scripts/test/SANS/state/normalize_to_monitor_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RebinType, RangeStepType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/reduction_mode_test.py b/scripts/test/SANS/state/reduction_mode_test.py
index 47d5051c128..3e939a0acfd 100644
--- a/scripts/test/SANS/state/reduction_mode_test.py
+++ b/scripts/test/SANS/state/reduction_mode_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionMode, ReductionDimensionality, FitModeForMerge,
diff --git a/scripts/test/SANS/state/save_test.py b/scripts/test/SANS/state/save_test.py
index fb9a0240505..51ac9901c96 100644
--- a/scripts/test/SANS/state/save_test.py
+++ b/scripts/test/SANS/state/save_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SaveType, SANSInstrument)
diff --git a/scripts/test/SANS/state/scale_test.py b/scripts/test/SANS/state/scale_test.py
index 685dd257c9e..2dc29c00af3 100644
--- a/scripts/test/SANS/state/scale_test.py
+++ b/scripts/test/SANS/state/scale_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SampleShape)
diff --git a/scripts/test/SANS/state/slice_event_test.py b/scripts/test/SANS/state/slice_event_test.py
index bdc76a18054..e4fc6f14def 100644
--- a/scripts/test/SANS/state/slice_event_test.py
+++ b/scripts/test/SANS/state/slice_event_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/state_functions_test.py b/scripts/test/SANS/state/state_functions_test.py
index 0c7c823f2d3..1330bbf4e3b 100644
--- a/scripts/test/SANS/state/state_functions_test.py
+++ b/scripts/test/SANS/state/state_functions_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionDimensionality)
diff --git a/scripts/test/SANS/state/state_test.py b/scripts/test/SANS/state/state_test.py
index 678137e17a7..28dc4d3e0aa 100644
--- a/scripts/test/SANS/state/state_test.py
+++ b/scripts/test/SANS/state/state_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSInstrument, SANSFacility)
diff --git a/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py b/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
index c1091c061c2..9f1e435ded6 100644
--- a/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
+++ b/scripts/test/SANS/state/wavelength_and_pixel_adjustment_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (RangeStepType, DetectorType, SANSFacility, SANSInstrument)
diff --git a/scripts/test/SANS/state/wavelength_test.py b/scripts/test/SANS/state/wavelength_test.py
index ae36df743d5..c5dd3cf435c 100644
--- a/scripts/test/SANS/state/wavelength_test.py
+++ b/scripts/test/SANS/state/wavelength_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (SANSFacility, SANSInstrument, RebinType, RangeStepType)
diff --git a/scripts/test/SANS/user_file/user_file_parser_test.py b/scripts/test/SANS/user_file/user_file_parser_test.py
index dd2ee7fde01..019b20f9217 100644
--- a/scripts/test/SANS/user_file/user_file_parser_test.py
+++ b/scripts/test/SANS/user_file/user_file_parser_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import unittest
from sans.common.enums import (ReductionMode, DetectorType, RangeStepType, FitType, DataType, SANSInstrument)
diff --git a/scripts/test/SANS/user_file/user_file_reader_test.py b/scripts/test/SANS/user_file/user_file_reader_test.py
index 68719c15df7..d4194cb3b1d 100644
--- a/scripts/test/SANS/user_file/user_file_reader_test.py
+++ b/scripts/test/SANS/user_file/user_file_reader_test.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
import os
import unittest
diff --git a/scripts/test/SANSBatchModeTest.py b/scripts/test/SANSBatchModeTest.py
index 80fa251f30c..7417155c0ee 100644
--- a/scripts/test/SANSBatchModeTest.py
+++ b/scripts/test/SANSBatchModeTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import re
# Need to import mantid before we import SANSUtility
diff --git a/scripts/test/SANSCentreFinderTest.py b/scripts/test/SANSCentreFinderTest.py
index 6bd5298be79..d25f810642c 100644
--- a/scripts/test/SANSCentreFinderTest.py
+++ b/scripts/test/SANSCentreFinderTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
from mantid.simpleapi import *
diff --git a/scripts/test/SANSCommandInterfaceTest.py b/scripts/test/SANSCommandInterfaceTest.py
index 1ade0f6bb65..b077bf9449e 100644
--- a/scripts/test/SANSCommandInterfaceTest.py
+++ b/scripts/test/SANSCommandInterfaceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
import os
diff --git a/scripts/test/SANSIsisInstrumentTest.py b/scripts/test/SANSIsisInstrumentTest.py
index 9fdcdec6fc8..907ef3d0890 100644
--- a/scripts/test/SANSIsisInstrumentTest.py
+++ b/scripts/test/SANSIsisInstrumentTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
from mantid.simpleapi import *
diff --git a/scripts/test/SANSReducerTest.py b/scripts/test/SANSReducerTest.py
index 7257f191e74..f4003f74ddb 100644
--- a/scripts/test/SANSReducerTest.py
+++ b/scripts/test/SANSReducerTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
diff --git a/scripts/test/SANSReductionStepsUserFileTest.py b/scripts/test/SANSReductionStepsUserFileTest.py
index f502e6d54c5..b24ca388c98 100644
--- a/scripts/test/SANSReductionStepsUserFileTest.py
+++ b/scripts/test/SANSReductionStepsUserFileTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import mantid
import isis_instrument as instruments
diff --git a/scripts/test/SANSUtilityTest.py b/scripts/test/SANSUtilityTest.py
index 65e9ca1a041..6560873b7fb 100644
--- a/scripts/test/SANSUtilityTest.py
+++ b/scripts/test/SANSUtilityTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
# Need to import mantid before we import SANSUtility
import mantid
diff --git a/scripts/test/SansIsisGuiSettings.py b/scripts/test/SansIsisGuiSettings.py
index abbcde8c811..5f7ed6b84c8 100644
--- a/scripts/test/SansIsisGuiSettings.py
+++ b/scripts/test/SansIsisGuiSettings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
from mantid.simpleapi import *
import ISISCommandInterface as i
diff --git a/scripts/test/SettingsTest.py b/scripts/test/SettingsTest.py
index 9be1fe2d742..fd0b4efc261 100644
--- a/scripts/test/SettingsTest.py
+++ b/scripts/test/SettingsTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
import unittest
import os
from mantid.simpleapi import *
diff --git a/scripts/test/TOFTOF/TOFTOFGUITest.py b/scripts/test/TOFTOF/TOFTOFGUITest.py
index 38b089507ce..629be0e0402 100644
--- a/scripts/test/TOFTOF/TOFTOFGUITest.py
+++ b/scripts/test/TOFTOF/TOFTOFGUITest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from qtpy.QtWidgets import QApplication
import unittest
diff --git a/scripts/test/TOFTOF/TOFTOFScriptElementTest.py b/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
index ef6a203f2cb..1d9395ce721 100644
--- a/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
+++ b/scripts/test/TOFTOF/TOFTOFScriptElementTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFScriptElement, OptionalFloat
import testhelpers
import unittest
diff --git a/scripts/test/directtools/DirectToolsTest.py b/scripts/test/directtools/DirectToolsTest.py
index 64ca1fd151e..d20f3e449f6 100644
--- a/scripts/test/directtools/DirectToolsTest.py
+++ b/scripts/test/directtools/DirectToolsTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function)
-
# Set matplotlib backend to AGG before anything else. Otherwise some build servers
# need to have extra packages (tkinter) installed.
import matplotlib
diff --git a/tools/DOI/doi.py b/tools/DOI/doi.py
index 4c0cbf30a12..9cc361880c4 100644
--- a/tools/DOI/doi.py
+++ b/tools/DOI/doi.py
@@ -62,7 +62,6 @@ USEFUL LINKS:
http://docs.python.org/2/library/httplib.html#httplib.HTTPS_PORT
"""
-from __future__ import (absolute_import, division, print_function)
import argparse
import getpass
import os
diff --git a/tools/DefaultConfigFiles/configToCpp.py b/tools/DefaultConfigFiles/configToCpp.py
index ab1dc191a00..75cfee1894d 100644
--- a/tools/DefaultConfigFiles/configToCpp.py
+++ b/tools/DefaultConfigFiles/configToCpp.py
@@ -9,7 +9,6 @@
## Dan Nixon
-from __future__ import (absolute_import, division, print_function)
import sys
with open(sys.argv[2]) as f:
diff --git a/tools/Documentation/wiki2rst.py b/tools/Documentation/wiki2rst.py
index 351be27e016..1855cfe9ef2 100755
--- a/tools/Documentation/wiki2rst.py
+++ b/tools/Documentation/wiki2rst.py
@@ -20,7 +20,6 @@ The bulk of the work is done by pandoc, which is expected to be in the PATH. The
the inline to normal format.
3. Image links cannot have spaces in the filename in rst.
The spaces are removed in the downloaded file names, but not the links in the rst files."""
-from __future__ import (absolute_import, division, print_function)
import argparse
import json
import os
diff --git a/tools/PeriodicTable/generate_atom_code.py b/tools/PeriodicTable/generate_atom_code.py
index 16fe1719475..d6b0218b3b6 100755
--- a/tools/PeriodicTable/generate_atom_code.py
+++ b/tools/PeriodicTable/generate_atom_code.py
@@ -6,7 +6,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
from six.moves import range
import optparse
import sys
diff --git a/tools/Pylint/fixPylint.py b/tools/Pylint/fixPylint.py
index 781ba49cdf6..1cb629669a6 100644
--- a/tools/Pylint/fixPylint.py
+++ b/tools/Pylint/fixPylint.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,anomalous-backslash-in-string
-from __future__ import (absolute_import, division, print_function)
-from __future__ import (absolute_import, division, print_function)
import os
import re
import argparse
diff --git a/tools/Pylint/run_pylint.py b/tools/Pylint/run_pylint.py
index 47b0e7756bc..e71aa0952e0 100644
--- a/tools/Pylint/run_pylint.py
+++ b/tools/Pylint/run_pylint.py
@@ -12,7 +12,6 @@
"""
-from __future__ import (absolute_import, division, print_function)
import logging
from optparse import OptionParser
import os.path
diff --git a/tools/VTKConverter/processISISData.py b/tools/VTKConverter/processISISData.py
index facd6a02c4e..b235e0578b5 100644
--- a/tools/VTKConverter/processISISData.py
+++ b/tools/VTKConverter/processISISData.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
import os
import sys
import VTKConvert
diff --git a/tools/release_generator/patch.py b/tools/release_generator/patch.py
index 1422b1d4a61..cc36d4948c7 100755
--- a/tools/release_generator/patch.py
+++ b/tools/release_generator/patch.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import requests
diff --git a/tools/release_generator/release.py b/tools/release_generator/release.py
index a17550b4b6e..cf0b6dfe4dd 100755
--- a/tools/release_generator/release.py
+++ b/tools/release_generator/release.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
diff --git a/tools/reports/facility-code-changes.py b/tools/reports/facility-code-changes.py
index 09c2a2b8399..d01cd20e77b 100644
--- a/tools/reports/facility-code-changes.py
+++ b/tools/reports/facility-code-changes.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import subprocess
import csv
diff --git a/tools/reports/release-list.py b/tools/reports/release-list.py
index 920974cd681..c7f19d46c6c 100644
--- a/tools/reports/release-list.py
+++ b/tools/reports/release-list.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
import datetime
import os
import requests
diff --git a/tools/scripts/ConvertBadAlgmLinks.py b/tools/scripts/ConvertBadAlgmLinks.py
index 1eab649ef0e..a85fdfff600 100644
--- a/tools/scripts/ConvertBadAlgmLinks.py
+++ b/tools/scripts/ConvertBadAlgmLinks.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import re
import glob
import os
diff --git a/tools/scripts/CorrectConceptLinksinAlgPages.py b/tools/scripts/CorrectConceptLinksinAlgPages.py
index df40d8d8e6a..7945c17f52c 100644
--- a/tools/scripts/CorrectConceptLinksinAlgPages.py
+++ b/tools/scripts/CorrectConceptLinksinAlgPages.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import re
from mantid.api import AlgorithmFactory
diff --git a/tools/scripts/FindIncompleteAlgRSTPages.py b/tools/scripts/FindIncompleteAlgRSTPages.py
index 2c5356aa374..56c2bdc3fe9 100644
--- a/tools/scripts/FindIncompleteAlgRSTPages.py
+++ b/tools/scripts/FindIncompleteAlgRSTPages.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from __future__ import (absolute_import, division, print_function)
import os
import re
import urllib2
diff --git a/tools/scripts/TestWikiPython.py b/tools/scripts/TestWikiPython.py
index 58e8e760bd6..b33ec8e31c0 100644
--- a/tools/scripts/TestWikiPython.py
+++ b/tools/scripts/TestWikiPython.py
@@ -10,7 +10,6 @@
# run with -h for command line arguments
#
##########################################################################################
-from __future__ import (absolute_import, division, print_function)
import os
import re
import sys
diff --git a/tools/scripts/extractAlgorithmNames.py b/tools/scripts/extractAlgorithmNames.py
index 70ae15f0233..1dedd93046d 100644
--- a/tools/scripts/extractAlgorithmNames.py
+++ b/tools/scripts/extractAlgorithmNames.py
@@ -7,7 +7,6 @@
#pylint: disable=invalid-name
# simply just print out all algorithm names in a directory which can be piped
# to a file
-from __future__ import (absolute_import, division, print_function)
import os
import glob
diff --git a/tools/scripts/extractAuthorNamesFromGit.py b/tools/scripts/extractAuthorNamesFromGit.py
index 5656ab8b36b..c60bf23a777 100644
--- a/tools/scripts/extractAuthorNamesFromGit.py
+++ b/tools/scripts/extractAuthorNamesFromGit.py
@@ -12,7 +12,6 @@
# was original used in connection with creating usage examples for algorithms
# and creating an algorithm list for each developer to have a go at
-from __future__ import (absolute_import, division, print_function)
import os
import subprocess
diff --git a/tools/scripts/pyqt4_to_qtpy.py b/tools/scripts/pyqt4_to_qtpy.py
index 312eb14ddee..2473d046199 100755
--- a/tools/scripts/pyqt4_to_qtpy.py
+++ b/tools/scripts/pyqt4_to_qtpy.py
@@ -5,7 +5,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, division, print_function, unicode_literals)
import os
import sys
diff --git a/tools/scripts/update-pr-base-branch.py b/tools/scripts/update-pr-base-branch.py
index af8a8ef20a8..9093f865b4b 100644
--- a/tools/scripts/update-pr-base-branch.py
+++ b/tools/scripts/update-pr-base-branch.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from __future__ import (absolute_import, print_function)
-
# std library
import argparse
import json
diff --git a/tools/sip/sipwrapper.py b/tools/sip/sipwrapper.py
index fc256e99b5e..3825d8d51d3 100755
--- a/tools/sip/sipwrapper.py
+++ b/tools/sip/sipwrapper.py
@@ -9,8 +9,6 @@
Wraps a call to the sip code generation executable to strip any throw specifications
from the generated code as these have been removed from C++17.
"""
-from __future__ import (absolute_import, division, print_function, unicode_literals)
-
# system imports
import argparse
import logging
--
GitLab
From df6656525f67365ce343e6e58cf806c019b72f9d Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 13:29:19 +0000
Subject: [PATCH 03/37] RE #27722 Remove future imports across multiple lines
---
.../workbench/plotting/test/test_figureerrorsmanager.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
index c72203b3dd3..ed27ed4cf6a 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureerrorsmanager.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-
-
import unittest
import matplotlib
--
GitLab
From a9d8ea4415f02198076e50f57ee5664da9edd782 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 15:29:38 +0000
Subject: [PATCH 04/37] RE #27722 Remove iteritems imported from six
---
.../PythonInterface/mantid/api/_workspaceops.py | 6 +++---
Framework/PythonInterface/mantid/simpleapi.py | 6 ++----
.../plugins/algorithms/LRScalingFactors.py | 5 +----
.../PythonInterface/plugins/algorithms/LoadCIF.py | 7 +++----
.../algorithms/StatisticsOfTableWorkspace.py | 4 +---
.../plugins/algorithms/VesuvioCorrections.py | 4 +---
.../FlatPlatePaalmanPingsCorrection.py | 3 +--
.../WorkflowAlgorithms/IndirectILLReductionFWS.py | 2 +-
.../WorkflowAlgorithms/TransmissionUtils.py | 5 +----
.../WorkflowAlgorithms/USANSReduction.py | 5 +----
.../test/python/mantid/api/AlgorithmHistoryTest.py | 4 +---
.../test/python/plugins/algorithms/LoadCIFTest.py | 11 +++++------
.../python/plugins/algorithms/VesuvioPreFitTest.py | 4 +---
.../python/plugins/algorithms/VesuvioTOFFitTest.py | 4 +---
MantidPlot/mantidplotrc.py | 4 +---
.../SystemTests/tests/analysis/CodeConventions.py | 4 +---
Testing/SystemTests/tests/analysis/SortHKLTest.py | 7 ++-----
.../analysis/SpaceGroupReflectionConditionsTest.py | 5 +----
.../tests/analysis/SpaceGroupUnitCellTest.py | 5 +----
.../SystemTests/tests/analysis/SphinxWarnings.py | 5 +----
.../tests/analysis/VesuvioCorrectionsTest.py | 5 +----
docs/sphinxext/mantiddoc/directives/algorithm.py | 4 +---
docs/sphinxext/mantiddoc/directives/categories.py | 6 +++---
docs/sphinxext/mantiddoc/directives/sourcelink.py | 4 +---
.../workbench/plotting/figureinteraction.py | 5 ++---
scripts/Diffraction/isis_powder/abstract_inst.py | 4 +---
.../isis_powder/routines/instrument_settings.py | 3 +--
.../isis_powder/routines/sample_details.py | 5 ++---
scripts/Inelastic/CrystalField/fitting.py | 4 ++--
scripts/Inelastic/CrystalField/normalisation.py | 3 +--
scripts/Inelastic/Direct/DirectEnergyConversion.py | 4 ++--
.../Inelastic/Direct/ISISDirecInelasticConfig.py | 4 ++--
scripts/Inelastic/Direct/PropertyManager.py | 14 +++++++-------
scripts/Inelastic/Direct/ReductionWrapper.py | 6 +++---
scripts/Inelastic/Direct/diagnostics.py | 3 +--
scripts/Inelastic/vesuvio/backgrounds.py | 4 +---
scripts/Inelastic/vesuvio/base.py | 4 +---
scripts/Inelastic/vesuvio/profiles.py | 4 +---
.../diffraction/diffraction_reduction_script.py | 4 ++--
scripts/MultiPlotting/subplot/subplot_context.py | 3 +--
.../Muon/GUI/Common/contexts/fitting_context.py | 4 ++--
.../GUI/ElementalAnalysis/LoadWidget/load_utils.py | 7 +++----
.../PeakSelector/peak_selector_view.py | 5 ++---
.../GUI/ElementalAnalysis/elemental_analysis.py | 13 ++++++-------
.../GUI/FrequencyDomainAnalysis/FFT/fft_model.py | 6 ++----
.../FrequencyDomainAnalysis/MaxEnt/maxent_model.py | 6 ++----
.../FrequencyDomainAnalysis/frequency_context.py | 5 ++---
scripts/SANS/SANSUtility.py | 4 ++--
scripts/SANS/isis_instrument.py | 4 +---
scripts/SANS/sans/gui_logic/models/RowEntries.py | 5 +++--
scripts/test/IndirectCommonTests.py | 2 +-
.../Muon/elemental_analysis/load_utils_test.py | 9 +++------
scripts/test/Muon/fit_parameters_test.py | 4 ++--
scripts/test/Muon/fitting_context_test.py | 4 ++--
.../results_tab_widget/results_tab_model_test.py | 4 ++--
tools/Documentation/wiki2rst.py | 2 +-
56 files changed, 102 insertions(+), 175 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/_workspaceops.py b/Framework/PythonInterface/mantid/api/_workspaceops.py
index 884acef7a41..d913536d0ad 100644
--- a/Framework/PythonInterface/mantid/api/_workspaceops.py
+++ b/Framework/PythonInterface/mantid/api/_workspaceops.py
@@ -15,7 +15,7 @@
import inspect as _inspect
import sys
-from six import Iterator, get_function_code, iteritems
+from six import Iterator, get_function_code
from mantid.api import AnalysisDataServiceImpl, ITableWorkspace, Workspace, WorkspaceGroup, performBinaryOp
from mantid.kernel.funcinspect import customise_func, lhs_info
@@ -62,7 +62,7 @@ def attach_binary_operators_to_workspace():
operations["Divide"] = divops
# Loop through and add each one in turn
- for alg, attributes in iteritems(operations):
+ for alg, attributes in operations.items():
if type(attributes) == str: attributes = [attributes]
for attr in attributes:
add_operator_func(attr, alg, attr.startswith('__i'), attr.startswith('__r'))
@@ -148,7 +148,7 @@ def attach_unary_operators_to_workspace():
'NotMD': '__invert__'
}
# Loop through and add each one in turn
- for alg, attributes in iteritems(operations):
+ for alg, attributes in operations.items():
if type(attributes) == str: attributes = [attributes]
for attr in attributes:
add_operator_func(attr, alg)
diff --git a/Framework/PythonInterface/mantid/simpleapi.py b/Framework/PythonInterface/mantid/simpleapi.py
index 2f4c2c59376..e3e66490a3f 100644
--- a/Framework/PythonInterface/mantid/simpleapi.py
+++ b/Framework/PythonInterface/mantid/simpleapi.py
@@ -33,8 +33,6 @@ import os
import sys
import six
-from six import iteritems
-
import mantid
# This is a simple API so give access to the aliases by default as well
from mantid import __gui__, api as _api, kernel as _kernel, apiVersion
@@ -1107,7 +1105,7 @@ def set_properties(alg_object, *args, **kwargs):
mandatory_props = []
postponed = []
- for (key, value) in iteritems(kwargs):
+ for (key, value) in kwargs.items():
if key in mandatory_props:
mandatory_props.remove(key)
if "IndexSet" in key:
@@ -1445,7 +1443,7 @@ def _translate():
algs = AlgorithmFactory.getRegisteredAlgorithms(True)
algorithm_mgr = AlgorithmManager
- for name, versions in iteritems(algs):
+ for name, versions in algs.items():
if specialization_exists(name):
continue
try:
diff --git a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
index 19a80942506..2b13fc66e16 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
@@ -10,9 +10,6 @@ import re
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
-from six import iteritems
-
-
class LRScalingFactors(PythonAlgorithm):
"""
This algorithm runs through a sequence of direct beam data sets
@@ -401,7 +398,7 @@ class LRScalingFactors(PythonAlgorithm):
fd.write("# y=a+bx\n#\n")
fd.write("# LambdaRequested[Angstroms] S1H[mm] (S2/Si)H[mm] S1W[mm] (S2/Si)W[mm] a b error_a error_b\n#\n")
- for k, v in iteritems(scaling_file_meta):
+ for k, v in scaling_file_meta.items():
fd.write("%s\n" % v)
for item in scaling_file_content:
fd.write("IncidentMedium=%s " % item["IncidentMedium"])
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
index 5e87e1efbf5..0f2814ef055 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadCIF.py
@@ -10,7 +10,6 @@ from mantid.simpleapi import *
from mantid.api import *
from mantid.geometry import SpaceGroupFactory, CrystalStructure, UnitCell
-from six import iteritems
import re
import numpy as np
@@ -250,7 +249,7 @@ class AtomListBuilder(object):
anisoLabels = self._get_ansitropic_labels(cifData)
equivalentUMap = self._getEquivalentUs(cifData, anisoLabels, unitCell)
- for key, uIso in iteritems(isotropicUMap):
+ for key, uIso in isotropicUMap.items():
if uIso is None and key in equivalentUMap:
isotropicUMap[key] = equivalentUMap[key]
@@ -267,7 +266,7 @@ class AtomListBuilder(object):
# Return U_equiv calculated according to [Fischer & Tillmanns, Acta Cryst C44, p775, 10.1107/S0108270187012745]
# in a dict like { 'label1': 'U_equiv1' ... }. Invalid matrices (containing None) are excluded.
return dict([(label, np.around(np.sum(np.multiply(uMatrix, sumWeights)) / 3., decimals=5))
- for label, uMatrix in iteritems(anisotropicParameters) if uMatrix.dtype.type != np.object_])
+ for label, uMatrix in anisotropicParameters.items() if uMatrix.dtype.type != np.object_])
def _getAnisotropicParametersU(self, cifData, labels):
# Try to extract U or if that fails, B.
@@ -279,7 +278,7 @@ class AtomListBuilder(object):
bTensors = self._getTensors(cifData, labels,
['_atom_site_aniso_b_11', '_atom_site_aniso_b_12', '_atom_site_aniso_b_13',
'_atom_site_aniso_b_22', '_atom_site_aniso_b_23', '_atom_site_aniso_b_33'])
- return dict([(label, convertBtoU(bTensor)) for label, bTensor in iteritems(bTensors)])
+ return dict([(label, convertBtoU(bTensor)) for label, bTensor in bTensors.items()])
def _get_ansitropic_labels(self, cifData):
anisoLabel = '_atom_site_aniso_label'
diff --git a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
index 91e43e369df..d8317f1bd4f 100644
--- a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
@@ -9,8 +9,6 @@
import collections
import numpy as np
-from six import iteritems
-
import mantid.simpleapi as ms
from mantid import logger, mtd
from mantid.api import AlgorithmFactory, ITableWorkspaceProperty, PythonAlgorithm
@@ -87,7 +85,7 @@ class StatisticsOfTableWorkspace(PythonAlgorithm):
except:
logger.notice('Column \'%s\' is not numerical, skipping' % column_name)
- for index, stat_name in iteritems(stats):
+ for index, stat_name in stats.items():
stat = collections.OrderedDict(stat_name)
stat['Statistic'] = index
out_ws.addRow(stat)
diff --git a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
index 1a1838ea2c5..068b10ae505 100644
--- a/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
+++ b/Framework/PythonInterface/plugins/algorithms/VesuvioCorrections.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init, too-many-instance-attributes
-from six import iteritems
-
from mantid.kernel import *
from mantid.api import *
from vesuvio.base import VesuvioBase, TableWorkspaceDictionaryFacade
@@ -417,7 +415,7 @@ class VesuvioCorrections(VesuvioBase):
for idx, wsn in enumerate(fit_workspaces):
tie = ''
- for param, value in iteritems(fixed_parameters):
+ for param, value in fixed_parameters.items():
if param in wsn:
tie = 'Scaling=%f,' % value
function_str = "name=TabulatedFunction,Workspace=%s," % wsn \
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
index 1b58da33aea..e2e7a0c9a71 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
@@ -7,7 +7,6 @@
# pylint: disable=no-init,invalid-name,too-many-instance-attributes
import math
-from six import iteritems
from six import integer_types
import numpy as np
@@ -544,7 +543,7 @@ class FlatPlatePaalmanPingsCorrection(PythonAlgorithm):
@param sample_logs Dictionary of logs to append to the workspace.
"""
- for key, value in iteritems(sample_logs):
+ for key, value in sample_logs.items():
if isinstance(value, bool):
log_type = 'String'
elif isinstance(value, (integer_types, float)):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
index 7588bba5057..371f22023bb 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionFWS.py
@@ -625,7 +625,7 @@ class IndirectILLReductionFWS(PythonAlgorithm):
self._set_x_label(wsname)
- for energy, ws_list in iteritems(self._all_runs[label]):
+ for energy, ws_list in self._all_runs[label].items():
for ws in ws_list:
DeleteWorkspace(ws)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
index a84d0aa3994..f4ab04871f6 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
@@ -9,9 +9,6 @@ from mantid.api import *
from mantid.kernel import *
import os
import sys
-from six import iteritems
-
-
def simple_algorithm(algorithm_str, parameters):
return _execute(algorithm_str, parameters)
@@ -23,7 +20,7 @@ def _execute(algorithm_str, parameters, is_name=True):
alg = Algorithm.fromString(algorithm_str)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(parameters):
+ for key, value in parameters.items():
if value is None:
Logger("TransmissionUtils").error("Trying to set %s=None" % key)
if alg.existsProperty(key):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
index 4e6279f0a57..e9e3110f365 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
@@ -13,9 +13,6 @@ import numpy
import sys
import os
import json
-from six import iteritems
-
-
class USANSReduction(PythonAlgorithm):
wl_list = None
@@ -319,7 +316,7 @@ def _execute(algorithm_name, **parameters):
alg = AlgorithmManager.create(algorithm_name)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(parameters):
+ for key, value in parameters.items():
if value is None:
Logger("USANSReduction").error("Trying to set %s=None" % key)
if alg.existsProperty(key):
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
index 9415e58f953..c32ad8c3b9a 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
@@ -9,8 +9,6 @@ from mantid.simpleapi import CreateWorkspace, set_properties
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, AlgorithmManager,
DataProcessorAlgorithm, PythonAlgorithm)
from mantid.kernel import Direction
-from six import iteritems
-
class ChildAlg(PythonAlgorithm):
def PyInit(self):
@@ -89,7 +87,7 @@ class AlgorithmHistoryTest(unittest.TestCase):
alg.initialize()
alg.setChild(child_algorithm)
alg.enableHistoryRecordingForChild(record_history)
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
alg.execute()
return alg
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
index 81f900d1cf5..7196b488d54 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadCIFTest.py
@@ -13,7 +13,6 @@ from LoadCIF import SpaceGroupBuilder, UnitCellBuilder, AtomListBuilder, UBMatri
from mantid.api import AlgorithmFactory
from mantid.geometry import UnitCell
-from six import iteritems
import numpy as np
import sys
@@ -206,7 +205,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01', u'0.02'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'], '22': [u'0.01', u'0.02'],
'23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -223,7 +222,7 @@ class AtomListBuilderTest(unittest.TestCase):
'22': [u'0.01', u'0.02'],
'23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -239,7 +238,7 @@ class AtomListBuilderTest(unittest.TestCase):
bElements = {'11': [u'1.0', u'2.0'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'],
'22': [u'1.0', u'2.0'], '23': [u'0.0', u'0.0'], '33': [u'4.0', u'5.0']}
- bDict = dict([(u'_atom_site_aniso_b_{0}'.format(key), value) for key, value in iteritems(bElements)])
+ bDict = dict([(u'_atom_site_aniso_b_{0}'.format(key), value) for key, value in bElements.items()])
bDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al'])
]))
@@ -254,7 +253,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01'], '12': [u'0.0'], '13': [u'0.0'], '22': [u'0.01'],
'23': [u'0.0'], '33': [u'0.04']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Al']),
(u'_atom_site_u_iso_or_equiv', [u'0.01', u'invalid'])
@@ -270,7 +269,7 @@ class AtomListBuilderTest(unittest.TestCase):
uElements = {'11': [u'0.01', u'0.02'], '12': [u'0.0', u'0.0'], '13': [u'0.0', u'0.0'],
'22': [u'0.01', u'0.02'], '23': [u'0.0', u'0.0'], '33': [u'0.04', u'0.05']}
- uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in iteritems(uElements)])
+ uDict = dict([(u'_atom_site_aniso_u_{0}'.format(key), value) for key, value in uElements.items()])
uDict.update(dict([(u'_atom_site_label', [u'Si', u'Al']),
(u'_atom_site_aniso_label', [u'Si', u'Al']),
(u'_atom_site_u_iso_or_equiv', [u'0.01', u'0.02'])
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
index e3e1bb91384..2502983b640 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
@@ -11,8 +11,6 @@ Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from six import iteritems
-
from mantid.api import AlgorithmManager
import numpy as np
@@ -113,7 +111,7 @@ class VesuvioPreFitTest(unittest.TestCase):
alg.initialize()
alg.setChild(True)
alg.setProperty("OutputWorkspace", "__unused")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
index 55127d93280..45a3a0504b2 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
@@ -10,8 +10,6 @@ Unit test for Vesuvio reduction
Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
-from six import iteritems
-
import unittest
import numpy as np
import sys
@@ -187,7 +185,7 @@ class VesuvioTOFFitTest(unittest.TestCase):
alg.setChild(True)
alg.setProperty("OutputWorkspace", "__unused")
alg.setProperty("FitParameters", "__unused")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/MantidPlot/mantidplotrc.py b/MantidPlot/mantidplotrc.py
index 1b463a9c7f2..f0713a31d8f 100644
--- a/MantidPlot/mantidplotrc.py
+++ b/MantidPlot/mantidplotrc.py
@@ -23,8 +23,6 @@ if __name__ == '__main__':
except ImportError:
pass
- from six import iteritems as _iteritems
-
# Import MantidPlot python commands
import mantidplot
from mantidplot import *
@@ -70,7 +68,7 @@ if __name__ == '__main__':
return []
from mantid.simpleapi import _get_function_spec
keywords = []
- for name,obj in _iteritems(definitions):
+ for name,obj in definitions.items():
if name.startswith('_') : continue
if _inspect.isclass(obj) or _inspect.ismodule(obj):
continue
diff --git a/Testing/SystemTests/tests/analysis/CodeConventions.py b/Testing/SystemTests/tests/analysis/CodeConventions.py
index 872a5b12d0c..fa0c88c8c9e 100644
--- a/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -10,8 +10,6 @@ import re
import mantid
from mantid.simpleapi import *
from six.moves import range
-from six import iteritems
-
MAX_ALG_LEN = 40 # TODO convention says 20 is the maximum
SPECIAL = ["InputWorkspace", "OutputWorkspace", "Workspace",
@@ -139,7 +137,7 @@ class Algorithms(systemtesting.MantidSystemTest):
def runTest(self):
algs = AlgorithmFactory.getRegisteredAlgorithms(True)
- for (name, versions) in iteritems(algs):
+ for (name, versions) in algs.items():
if not self.verifyAlgName(name):
self.__ranOk += 1
continue
diff --git a/Testing/SystemTests/tests/analysis/SortHKLTest.py b/Testing/SystemTests/tests/analysis/SortHKLTest.py
index a52e77b59e4..8a3d95119b9 100644
--- a/Testing/SystemTests/tests/analysis/SortHKLTest.py
+++ b/Testing/SystemTests/tests/analysis/SortHKLTest.py
@@ -9,9 +9,6 @@ import systemtesting
import json
from mantid.simpleapi import *
from mantid.geometry import PointGroupFactory
-from six import iteritems
-
-
class HKLStatisticsTestMixin(object):
def _init_test_data(self):
self._ws = CreateSimulationWorkspace(Instrument='TOPAZ',
@@ -42,7 +39,7 @@ class HKLStatisticsTestMixin(object):
ub_parameters.update(
dict(
[(str(x), y if isinstance(y, float) else str(y))
- for x, y in iteritems(raw_ub_parameters)]
+ for x, y in raw_ub_parameters.items()]
))
return ub_parameters
@@ -149,7 +146,7 @@ class SortHKLTest(HKLStatisticsTestMixin, systemtesting.MantidSystemTest):
unique_map[unique].append(peak)
# pylint: disable=unused-variable
- for unique_hkl, equivalents in iteritems(unique_map):
+ for unique_hkl, equivalents in unique_map.items():
if len(equivalents) > 1:
reference_peak = equivalents[0]
for peak in equivalents[1:]:
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
index 013bb9f92ec..b7f4cbb15d4 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
@@ -8,9 +8,6 @@
import systemtesting
from mantid.simpleapi import *
from mantid.geometry import *
-from six import iteritems
-
-
class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
'''
This test uses PoldiCreatePeaksFromCell to generate lists of reflections for fake crystal structures, one for each
@@ -25,7 +22,7 @@ class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
def runTest(self):
sgTestDict = self.generateReflectionLists()
- for sgName, hkls in iteritems(sgTestDict):
+ for sgName, hkls in sgTestDict.items():
sg = SpaceGroupFactory.createSpaceGroup(sgName)
for hkl in hkls:
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
index 9d0b97d42c1..f3e8d3df3c6 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
@@ -7,9 +7,6 @@
# pylint: disable=no-init,invalid-name
import systemtesting
from mantid.geometry import *
-from six import iteritems
-
-
class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
'''
This test checks that SpaceGroup.isAllowedUnitCell produces the expected result for each registered space group.
@@ -39,7 +36,7 @@ class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
self._check_spacegroup(sg, monoclinic_c_cells, monoclinic_c_compatiblity[lattice_system])
def _check_spacegroup(self, sg, cells, compatible_metrics):
- for system, cell in iteritems(cells):
+ for system, cell in cells.items():
is_allowed = sg.isAllowedUnitCell(cell)
should_be_allowed = system in compatible_metrics
diff --git a/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 557e3067add..6eeb6a8b27d 100644
--- a/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -13,9 +13,6 @@ It also detects if a new category is created (i.e. someone uses Utilities instea
import systemtesting
import mantid
import re
-from six import iteritems
-
-
class SphinxWarnings(systemtesting.MantidSystemTest):
def __init__(self):
systemtesting.MantidSystemTest.__init__(self)
@@ -87,7 +84,7 @@ class SphinxWarnings(systemtesting.MantidSystemTest):
def runTest(self):
algs = mantid.AlgorithmFactory.getRegisteredAlgorithms(True)
- for (name, versions) in iteritems(algs):
+ for (name, versions) in algs.items():
for version in versions:
if mantid.api.DeprecatedAlgorithmChecker(name,version).isDeprecated()=='':
# get an instance
diff --git a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
index 82ad8883c8a..f216e055572 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
@@ -18,9 +18,6 @@ import numpy as np
from mantid.api import *
import mantid.simpleapi as ms
from mantid import *
-from six import iteritems
-
-
# ====================================Helper Functions=======================================
@@ -57,7 +54,7 @@ def _create_algorithm(**kwargs):
alg.setProperty("CorrectionWorkspaces", "__Correction")
alg.setProperty("CorrectedWorkspaces", "__Corrected")
alg.setProperty("LinearFitResult", "__LinearFit")
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index 4ea14816349..ca37db2a85c 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -7,8 +7,6 @@
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import os
import re
-from six import iteritems
-
REDIRECT_TEMPLATE = "redirect.html"
DEPRECATE_USE_ALG_RE = re.compile(r"Use\s(([A-Z][a-zA-Z0-9]+)\s(version ([0-9])+)?)\s*instead.")
@@ -218,7 +216,7 @@ def html_collect_pages(dummy_app):
template = REDIRECT_TEMPLATE
all_algs = AlgorithmFactory.getRegisteredAlgorithms(True)
- for name, versions in iteritems(all_algs):
+ for name, versions in all_algs.items():
redirect_pagename = "algorithms/%s" % name
versions.sort()
highest_version = versions[-1]
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 1273923d55a..0bcf6f245e7 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/docs/sphinxext/mantiddoc/directives/categories.py
@@ -16,7 +16,7 @@ from mantiddoc.directives.base import AlgorithmBaseDirective, algorithm_name_and
from sphinx.util.osutil import relative_uri
import os
import posixpath
-from six import iteritems, itervalues
+from six import itervalues
CATEGORY_PAGE_TEMPLATE = "category.html"
ALG_CATEGORY_PAGE_TEMPLATE = "algorithmcategories.html"
@@ -344,7 +344,7 @@ def create_category_pages(app):
template = CATEGORY_PAGE_TEMPLATE
categories = env.categories
- for name, category in iteritems(categories):
+ for name, category in categories.items():
context = {}
# First write out the named page
context["title"] = category.name
@@ -408,7 +408,7 @@ def create_top_algorithm_category(categories):
all_top_categories = []
category_src_dir = ''
# If the category is a top category it will not contain "\\"
- for top_name, top_category in iteritems(categories):
+ for top_name, top_category in categories.items():
#Add all the top level categories
if "\\" not in top_name and top_category.section == 'algorithms':
#get additional text for each category
diff --git a/docs/sphinxext/mantiddoc/directives/sourcelink.py b/docs/sphinxext/mantiddoc/directives/sourcelink.py
index 9332153beeb..11aa65458c4 100644
--- a/docs/sphinxext/mantiddoc/directives/sourcelink.py
+++ b/docs/sphinxext/mantiddoc/directives/sourcelink.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import os
import subprocess
-from six import iteritems
-
import mantid
from .base import AlgorithmBaseDirective #pylint: disable=unused-import
@@ -202,7 +200,7 @@ class SourceLinkDirective(AlgorithmBaseDirective):
valid_ext_list = []
self.add_rst(self.make_header("Source"))
- for extension, filepath in iteritems(file_paths):
+ for extension, filepath in file_paths.items():
if filepath is not None:
self.output_path_to_page(filepath, extension)
valid_ext_list.append(extension)
diff --git a/qt/applications/workbench/workbench/plotting/figureinteraction.py b/qt/applications/workbench/workbench/plotting/figureinteraction.py
index d0bafde9cc2..658b5996e38 100644
--- a/qt/applications/workbench/workbench/plotting/figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/figureinteraction.py
@@ -24,7 +24,6 @@ from matplotlib.collections import Collection
from mantid.api import AnalysisDataService as ads
from mantid.plots import datafunctions, MantidAxes
from mantid.plots.utility import zoom, MantidAxType
-from mantid.py3compat import iteritems
from mantidqt.plotting.figuretype import FigureType, figure_type
from mantidqt.plotting.markers import SingleMarker
from mantidqt.widgets.plotconfigdialog.curvestabwidget import curve_has_errors, CurveProperties
@@ -306,7 +305,7 @@ class FigureInteraction(object):
axes_menu = QMenu("Axes", menu)
axes_actions = QActionGroup(axes_menu)
current_scale_types = (ax.get_xscale(), ax.get_yscale())
- for label, scale_types in iteritems(AXES_SCALE_MENU_OPTS):
+ for label, scale_types in AXES_SCALE_MENU_OPTS.items():
action = axes_menu.addAction(label, partial(self._quick_change_axes, scale_types, ax))
if current_scale_types == scale_types:
action.setCheckable(True)
@@ -344,7 +343,7 @@ class FigureInteraction(object):
axes_menu = QMenu("Color bar", menu)
axes_actions = QActionGroup(axes_menu)
images = ax.get_images() + [col for col in ax.collections if isinstance(col, Collection)]
- for label, scale_type in iteritems(COLORBAR_SCALE_MENU_OPTS):
+ for label, scale_type in COLORBAR_SCALE_MENU_OPTS.items():
action = axes_menu.addAction(label, partial(self._change_colorbar_axes, scale_type))
if type(images[0].norm) == scale_type:
action.setCheckable(True)
diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py
index 7a2951ae333..62b5a8c40ab 100644
--- a/scripts/Diffraction/isis_powder/abstract_inst.py
+++ b/scripts/Diffraction/isis_powder/abstract_inst.py
@@ -7,8 +7,6 @@
import os
from isis_powder.routines import calibrate, focus, common, common_enums, common_output
from mantid.kernel import config, logger
-from six import iteritems
-
# This class provides common hooks for instruments to override
# if they want to define the behaviour of the hook. Otherwise it
# returns the object passed in without manipulating it as a default
@@ -320,7 +318,7 @@ class AbstractInst(object):
"tof_xye_filename": dat_files_directory,
"dspacing_xye_filename": dat_files_directory
}
- for key, output_dir in iteritems(output_formats):
+ for key, output_dir in output_formats.items():
filepath = os.path.join(output_dir,
getattr(self._inst_settings, key).format(**format_options))
out_file_names[key] = filepath
diff --git a/scripts/Diffraction/isis_powder/routines/instrument_settings.py b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
index 5203c0352ec..75d6ca6d1f7 100644
--- a/scripts/Diffraction/isis_powder/routines/instrument_settings.py
+++ b/scripts/Diffraction/isis_powder/routines/instrument_settings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems
from isis_powder.routines import yaml_parser
import warnings
@@ -188,7 +187,7 @@ def _get_enum_values(enum_cls):
"""
enum_known_vals = []
- for k, enum_val in iteritems(enum_cls.__dict__):
+ for k, enum_val in enum_cls.__dict__.items():
# Get all class attribute and value pairs except enum_friendly_name
if k.startswith("__") or k.lower() == "enum_friendly_name":
continue
diff --git a/scripts/Diffraction/isis_powder/routines/sample_details.py b/scripts/Diffraction/isis_powder/routines/sample_details.py
index cf8168cdd23..addcffe6b0a 100644
--- a/scripts/Diffraction/isis_powder/routines/sample_details.py
+++ b/scripts/Diffraction/isis_powder/routines/sample_details.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems
from isis_powder.routines import common
import math
from mantid import logger
@@ -93,7 +92,7 @@ class SampleDetails(object):
# Attempt to convert them all to floating point relying on the fact on
# the way Python has aliases to an object
- for key, value in iteritems(values_to_check):
+ for key, value in values_to_check.items():
_check_value_is_physical(property_name=key, value=value)
_check_can_convert_to_float(property_name=key, value=value)
@@ -224,7 +223,7 @@ class _Cylinder(object):
# Attempt to convert them all to floating point relying on the fact on
# the way Python has aliases to an object
- for key, value in iteritems(values_to_check):
+ for key, value in values_to_check.items():
_check_value_is_physical(property_name=key, value=value)
_check_can_convert_to_float(property_name=key, value=value)
diff --git a/scripts/Inelastic/CrystalField/fitting.py b/scripts/Inelastic/CrystalField/fitting.py
index f7e627cfa56..ec55d75e067 100644
--- a/scripts/Inelastic/CrystalField/fitting.py
+++ b/scripts/Inelastic/CrystalField/fitting.py
@@ -7,7 +7,7 @@
import numpy as np
import re
import warnings
-from six import string_types, iteritems
+from six import string_types
# RegEx pattern matching a composite function parameter name, eg f2.Sigma.
@@ -1003,7 +1003,7 @@ class CrystalField(object):
params['ion1.' + bparam] = other[bparam]
ties = {}
fixes = []
- for prefix, obj in iteritems({'ion0.':self, 'ion1.':other}):
+ for prefix, obj in {'ion0.':self, 'ion1.':other}.items():
tiestr = obj.function.getTies()
if tiestr:
for tiepair in [tie.split('=') for tie in tiestr.split(',')]:
diff --git a/scripts/Inelastic/CrystalField/normalisation.py b/scripts/Inelastic/CrystalField/normalisation.py
index 8c7603d168a..d7d7ea42086 100644
--- a/scripts/Inelastic/CrystalField/normalisation.py
+++ b/scripts/Inelastic/CrystalField/normalisation.py
@@ -7,7 +7,6 @@
import numpy as np
from CrystalField.energies import energies as CFEnergy
from CrystalField.fitting import ionname2Nre
-from six import iteritems
from six import string_types
@@ -179,7 +178,7 @@ def split2range(*args, **kwargs):
if isinstance(args[ia], string_types) and args[ia].startswith('B'):
argin['Parameters'].append(args[ia])
# Parses the keyword arguments
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
for ia in range(len(argnames)):
if key == argnames[ia]:
argin[key] = value
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 0b3efda17ad..43966da527a 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -17,7 +17,7 @@ import math
import time
import numpy as np
import collections
-from six import iteritems, string_types
+from six import string_types
from six.moves import range
import Direct.CommonFunctions as common
@@ -1518,7 +1518,7 @@ class DirectEnergyConversion(object):
scale_factor = van_multiplier * sample_multiplier / xsection
- for norm_type,val in iteritems(norm_factor):
+ for norm_type,val in norm_factor.items():
norm_factor[norm_type] = val * scale_factor
# check for NaN
diff --git a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
index 6af0bc114e1..e1c154d26b8 100644
--- a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
+++ b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
@@ -14,7 +14,7 @@ import copy
from datetime import date
import time
from xml.dom import minidom
-from six import iteritems, string_types
+from six import string_types
# the list of instruments this configuration is applicable to
INELASTIC_INSTRUMENTS = ['MAPS', 'LET', 'MERLIN', 'MARI', 'HET']
@@ -93,7 +93,7 @@ class UserProperties(object):
self._rb_dirs[recent_date_id] = rb_folder_or_id
if self._recent_dateID:
max_date = self._start_dates[self._recent_dateID]
- for date_key, a_date in iteritems(self._start_dates):
+ for date_key, a_date in self._start_dates.items():
if a_date > max_date:
self._recent_dateID = date_key
max_date = a_date
diff --git a/scripts/Inelastic/Direct/PropertyManager.py b/scripts/Inelastic/Direct/PropertyManager.py
index 46e19fb9ca8..501eb5bc4bd 100644
--- a/scripts/Inelastic/Direct/PropertyManager.py
+++ b/scripts/Inelastic/Direct/PropertyManager.py
@@ -11,7 +11,7 @@
from Direct.NonIDF_Properties import *
from collections import OrderedDict, Iterable
-from six import iteritems, string_types
+from six import string_types
from mantid.kernel import funcinspect
@@ -103,7 +103,7 @@ class PropertyManager(NonIDF_Properties):
self.__dict__.update(param_dict)
# use existing descriptors setter to define IDF-defined descriptor's state
- for key,val in iteritems(descr_dict):
+ for key,val in descr_dict.items():
object.__setattr__(self,key,val)
# file properties -- the properties described files which should exist for reduction to work.
@@ -140,7 +140,7 @@ class PropertyManager(NonIDF_Properties):
class_decor = '_'+type(self).__name__+'__'
- for key,val in iteritems(prop_dict):
+ for key,val in prop_dict.items():
new_key = class_decor+key
object.__setattr__(self,new_key,val)
@@ -351,7 +351,7 @@ class PropertyManager(NonIDF_Properties):
'instr_name':'','print_diag_results':True,'mapmask_ref_ws':None}
result = {}
- for key,val in iteritems(diag_param_list):
+ for key,val in diag_param_list.items():
try:
result[key] = getattr(self,key)
except KeyError:
@@ -399,7 +399,7 @@ class PropertyManager(NonIDF_Properties):
# Walk through descriptors list and set their values
# Assignment to descriptors should accept the form, descriptor is written in IDF
changed_descriptors = set()
- for key,val in iteritems(descr_dict):
+ for key,val in descr_dict.items():
if key not in old_changes_list:
try: # this is reliability check, and except ideally should never be hit. May occur if old IDF contains
# properties, not present in recent IDF.
@@ -443,7 +443,7 @@ class PropertyManager(NonIDF_Properties):
self.setChangedProperties(changed_descriptors)
# Walk through the complex properties first and then through simple properties
- for key,val in iteritems(sorted_param.copy()):
+ for key,val in sorted_param.copy().items():
# complex properties may change through their dependencies so we are setting them first
public_name = self.is_complex_property(key, val)
@@ -551,7 +551,7 @@ class PropertyManager(NonIDF_Properties):
self.setChangedProperties(set())
# set back all changes stored earlier and may be overwritten by new IDF
# (this is just to be sure -- should not change anything as we do not set properties changed)
- for key,val in iteritems(old_changes):
+ for key,val in old_changes.items():
setattr(self,key,val)
# Clear changed properties list (is this wise?, may be we want to know that some defaults changed?)
diff --git a/scripts/Inelastic/Direct/ReductionWrapper.py b/scripts/Inelastic/Direct/ReductionWrapper.py
index 17517e6fdc0..84146b1bee0 100644
--- a/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -16,7 +16,7 @@ from types import MethodType # noqa
import os
import re
import time
-from six import iteritems, string_types
+from six import string_types
try:
import h5py
@@ -133,7 +133,7 @@ class ReductionWrapper(object):
f = open(FileName, 'w')
f.write("standard_vars = {\n")
str_wrapper = ' '
- for key, val in iteritems(self._wvs.standard_vars):
+ for key, val in self._wvs.standard_vars.items():
if isinstance(val, string_types):
row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
else:
@@ -143,7 +143,7 @@ class ReductionWrapper(object):
f.write("\n}\nadvanced_vars={\n")
# print advances variables
str_wrapper = ' '
- for key, val in iteritems(self._wvs.advanced_vars):
+ for key, val in self._wvs.advanced_vars.items():
if isinstance(val, string_types):
row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
else:
diff --git a/scripts/Inelastic/Direct/diagnostics.py b/scripts/Inelastic/Direct/diagnostics.py
index 258c27f68b0..e6db56ecd6f 100644
--- a/scripts/Inelastic/Direct/diagnostics.py
+++ b/scripts/Inelastic/Direct/diagnostics.py
@@ -23,7 +23,6 @@ from mantid.kernel.funcinspect import lhs_info
import os
import Direct.RunDescriptor as RunDescriptor
from Direct.PropertyManager import PropertyManager
-from six import iteritems
# Reference to reducer used if necessary for working with run descriptors (in diagnostics)
__Reducer__ = None
@@ -476,5 +475,5 @@ class ArgumentParser(object):
def __init__(self, keywords):
self.start_index = None # Make this more general for anything that is missing!
self.end_index = None
- for key, value in iteritems(keywords):
+ for key, value in keywords.items():
setattr(self, key, value)
diff --git a/scripts/Inelastic/vesuvio/backgrounds.py b/scripts/Inelastic/vesuvio/backgrounds.py
index fb2c017b1c2..873431c605f 100644
--- a/scripts/Inelastic/vesuvio/backgrounds.py
+++ b/scripts/Inelastic/vesuvio/backgrounds.py
@@ -7,8 +7,6 @@
# pylint: disable=too-few-public-methods,redefined-builtin
"""Holds classes that define the backgrounds for fitting
"""
-from six import iteritems
-
import ast
# --------------------------------------------------------------------------------
@@ -89,5 +87,5 @@ def create_from_str(func_str):
errors[str(cls)] = str(exc)
# if we get here we were unable to parse anything acceptable
- msgs = ["{0}: {1}".format(name, error) for name, error in iteritems(errors)]
+ msgs = ["{0}: {1}".format(name, error) for name, error in errors.items()]
raise ValueError("\n".join(msgs))
diff --git a/scripts/Inelastic/vesuvio/base.py b/scripts/Inelastic/vesuvio/base.py
index 77569b78fe6..b68f071f127 100644
--- a/scripts/Inelastic/vesuvio/base.py
+++ b/scripts/Inelastic/vesuvio/base.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=too-few-public-methods,redefined-builtin
-from six import iteritems
-
from mantid.api import Algorithm
@@ -36,7 +34,7 @@ class VesuvioBase(Algorithm):
ret_props = [ret_props]
del kwargs['return_values']
- for name, value in iteritems(kwargs):
+ for name, value in kwargs.items():
alg.setProperty(name, value)
alg.execute()
diff --git a/scripts/Inelastic/vesuvio/profiles.py b/scripts/Inelastic/vesuvio/profiles.py
index 47df8a1b978..daf0f00d08e 100644
--- a/scripts/Inelastic/vesuvio/profiles.py
+++ b/scripts/Inelastic/vesuvio/profiles.py
@@ -9,8 +9,6 @@
This is all essentially about parsing the user input and putting it into a form
the Mantid fitting algorithm will understand
"""
-from six import iteritems
-
import ast
import collections
import re
@@ -429,5 +427,5 @@ def create_from_str(func_str, mass):
errors[str(cls)] = str(exc)
# if we get here we were unable to parse anything acceptable
- msgs = ["{0}: {1}".format(name, error) for name, error in iteritems(errors)]
+ msgs = ["{0}: {1}".format(name, error) for name, error in errors.items()]
raise ValueError("\n".join(msgs))
diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
index 1bc9e6eb4e7..9050f4e42bf 100644
--- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
+++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_reduction_script.py
@@ -303,7 +303,7 @@ class DiffractionReductionScripter(BaseReductionScripter):
runsetupdict.pop('ExpIniFile', None)
# c) all properties
- for propname, propvalue in runsetupdict.iteritems():
+ for propname, propvalue in runsetupdict.items():
# skip these pseudo-properties
if propname in ['DisableBackgroundCorrection', 'DisableVanadiumCorrection',
'DisableVanadiumBackgroundCorrection', 'DoReSampleX']:
@@ -328,7 +328,7 @@ class DiffractionReductionScripter(BaseReductionScripter):
# ENDFOR
# 2. Advanced setup
- for propname, propvalue in advsetupdict.iteritems():
+ for propname, propvalue in advsetupdict.items():
if propvalue == '' or propvalue is None:
# Skip not-defined value
continue
diff --git a/scripts/MultiPlotting/subplot/subplot_context.py b/scripts/MultiPlotting/subplot/subplot_context.py
index a6322e4340b..264db242b05 100644
--- a/scripts/MultiPlotting/subplot/subplot_context.py
+++ b/scripts/MultiPlotting/subplot/subplot_context.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems
from mantid import plots
from copy import copy
@@ -192,7 +191,7 @@ class subplotContext(object):
del self._specNum[name]
# remove line for ws
to_delete = []
- for key, list in iteritems(self._ws):
+ for key, list in self._ws.items():
if name in list:
list.remove(name)
if len(list) == 0:
diff --git a/scripts/Muon/GUI/Common/contexts/fitting_context.py b/scripts/Muon/GUI/Common/contexts/fitting_context.py
index a4e9cc55fac..3fa5e62bc43 100644
--- a/scripts/Muon/GUI/Common/contexts/fitting_context.py
+++ b/scripts/Muon/GUI/Common/contexts/fitting_context.py
@@ -8,7 +8,7 @@ from collections import OrderedDict
import re
from mantid.api import AnalysisDataService
-from mantid.py3compat import iteritems, iterkeys, string_types
+from mantid.py3compat import iterkeys, string_types
import numpy as np
from mantidqt.utils.observer_pattern import Observable
@@ -84,7 +84,7 @@ def _move_globals_to_front(unique_params):
:return: The updated parameters list reordered
"""
return OrderedDict(
- sorted(iteritems(unique_params), key=lambda x: not x[1].is_global))
+ sorted(unique_params.items(), key=lambda x: not x[1].is_global))
class Parameter(object):
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
index 2b81b1e39ff..034f41ef85b 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LoadWidget/load_utils.py
@@ -9,7 +9,6 @@ from collections import OrderedDict
import glob
import os
import numpy as np
-from six import iteritems
from mantid import config
import mantid.simpleapi as mantid
@@ -27,7 +26,7 @@ class LModel(object):
def _load(self, inputs):
""" inputs is a dict mapping filepaths to output names """
- for path, output in iteritems(inputs):
+ for path, output in inputs.items():
workspace = mantid.LoadAscii(path, OutputWorkspace=output)
workspace.getAxis(0).setUnit("Label").setLabel("Energy", "keV")
@@ -40,7 +39,7 @@ class LModel(object):
for filename in to_load if get_filename(filename, self.run) is not None
}
unique_workspaces = {}
- for path, workspace in iteritems(workspaces):
+ for path, workspace in workspaces.items():
if workspace not in unique_workspaces.values():
unique_workspaces[path] = workspace
workspaces = unique_workspaces
@@ -98,7 +97,7 @@ def merge_workspaces(run, workspaces):
tmp = mantid.CreateSampleWorkspace()
overall_ws = mantid.GroupWorkspaces(tmp, OutputWorkspace=str(run))
# merge each workspace list in detectors into a single workspace
- for detector, workspace_list in iteritems(detectors):
+ for detector, workspace_list in detectors.items():
if workspace_list:
# sort workspace list according to type_index
sorted_workspace_list = [None] * num_files_per_detector
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
index 5b06950da42..e9de4acf4dd 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_view.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from qtpy import QtWidgets, QtCore
-from six import iteritems
import numpy as np
from Muon.GUI.Common.checkbox import Checkbox
@@ -119,7 +118,7 @@ class PeakSelectorView(QtWidgets.QListWidget):
return self.new_data
def update_new_data(self, data):
- for el, values in iteritems(data):
+ for el, values in data.items():
if values is None:
data[el] = {}
new_data = data["Primary"].copy()
@@ -138,7 +137,7 @@ class PeakSelectorView(QtWidgets.QListWidget):
_heading = QtWidgets.QLabel(heading)
self.list.addWidget(_heading)
checkboxes = []
- for peak_type, value in iteritems(checkbox_data):
+ for peak_type, value in checkbox_data.items():
checkboxes.append(self._setup_checkbox("{}: {}".format(peak_type, value), checked))
return checkboxes
diff --git a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
index 488bf1e6011..e10142e3e4d 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/elemental_analysis.py
@@ -7,7 +7,6 @@
from qtpy import QtWidgets
from copy import deepcopy
import matplotlib as mpl
-from six import iteritems
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_presenter import PeriodicTablePresenter
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_view import PeriodicTableView
@@ -232,7 +231,7 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
# Select a different color, if all used then use the first
color = self.get_color(element)
- for name, x_value in iteritems(data):
+ for name, x_value in data.items():
try:
x_value = float(x_value)
except ValueError:
@@ -336,7 +335,7 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
if data is None:
data = self.element_widgets[element].get_checked()
color = self.get_color(element)
- for name, x_value in iteritems(data):
+ for name, x_value in data.items():
if isinstance(x_value, float):
full_name = gen_name(element, name)
label = self._gen_label(full_name, x_value, element)
@@ -414,19 +413,19 @@ class ElementalAnalysisGui(QtWidgets.QMainWindow):
self._update_peak_data(element)
def electrons_changed(self, electron_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.electron_checkboxes, electron_peaks.isChecked())
def gammas_changed(self, gamma_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.gamma_checkboxes, gamma_peaks.isChecked())
def major_peaks_changed(self, major_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.primary_checkboxes, major_peaks.isChecked())
def minor_peaks_changed(self, minor_peaks):
- for element, selector in iteritems(self.element_widgets):
+ for element, selector in self.element_widgets.items():
self.checked_data(element, selector.secondary_checkboxes, minor_peaks.isChecked())
def add_line_by_type(self, run, _type):
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
index f4884f50715..39c214d2259 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/FFT/fft_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems
-
import mantid.simpleapi as mantid
@@ -96,7 +94,7 @@ class FFTModel(object):
self.alg.initialize()
self.alg.setRethrows(True)
- for name, value in iteritems(preInputs):
+ for name, value in preInputs.items():
self.alg.setProperty(name, value)
self.alg.execute()
self.alg = None
@@ -109,7 +107,7 @@ class FFTModel(object):
self.alg.initialize()
self.alg.setRethrows(True)
- for name, value in iteritems(FFTInputs):
+ for name, value in FFTInputs.items():
self.alg.setProperty(name, value)
self.alg.execute()
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
index 24a158ff398..3a379386822 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_model.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems
-
import mantid.simpleapi as mantid
from Muon.GUI.Common.validate_errors import validateToErrors
@@ -69,7 +67,7 @@ class MaxEntModel(object):
self.alg = mantid.AlgorithmManager.create("MuonMaxent")
self.alg.initialize()
self.alg.setAlwaysStoreInADS(False)
- for name, value in iteritems(inputs):
+ for name, value in inputs.items():
self.alg.setProperty(name, value)
self.alg.setRethrows(True)
validateToErrors(self.alg)
@@ -90,7 +88,7 @@ class MaxEntModel(object):
self.alg.setAlwaysStoreInADS(False)
self.alg.setRethrows(True)
- for name, value in iteritems(inputs):
+ for name, value in inputs.items():
self.alg.setProperty(name, value)
# check for version 1
if inputs["InputWorkspace"] != "MuonAnalysis" and "MuonAnalysisGrouped" in inputs["InputWorkspace"]:
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
index 46d09faa0a3..3606f22a112 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/frequency_context.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
from re import findall
-from six import iteritems
from mantid import AnalysisDataService
@@ -73,13 +72,13 @@ class FrequencyContext(object):
def get_frequency_workspace_names(self, run_list, group, pair, phasequad, frequency_type):
# do MaxEnt first as it only has run number
names = []
- for name, maxEnt in iteritems(self._maxEnt_freq):
+ for name, maxEnt in self._maxEnt_freq.items():
for runs in run_list:
for run in runs:
if int(run) == int(maxEnt.run):
names.append(name)
# do FFT
- for name, fft in iteritems(self._FFT_freq):
+ for name, fft in self._FFT_freq.items():
for runs in run_list:
for run in runs:
# check Re part
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index 2255db7ca40..91a61ef1ac6 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -17,7 +17,7 @@ import inspect
import math
import os
import re
-from six import types, iteritems, PY3
+from six import types, PY3
import numpy as np
import h5py as h5
@@ -1970,7 +1970,7 @@ def createUnmanagedAlgorithm(name, **kwargs):
alg = AlgorithmManager.createUnmanaged(name)
alg.initialize()
alg.setChild(True)
- for key, value in iteritems(kwargs):
+ for key, value in kwargs.items():
alg.setProperty(key, value)
return alg
diff --git a/scripts/SANS/isis_instrument.py b/scripts/SANS/isis_instrument.py
index 707ca35edbe..2eb89630de7 100644
--- a/scripts/SANS/isis_instrument.py
+++ b/scripts/SANS/isis_instrument.py
@@ -16,8 +16,6 @@ from mantid.kernel import Logger
from mantid.kernel import V3D
import SANSUtility as su
from math import copysign
-from six import iteritems
-
sanslog = Logger("SANS")
@@ -615,7 +613,7 @@ class ISISInstrument(BaseInstrument):
return self.DETECTORS['high-angle']
def getDetector(self, requested):
- for _n, detect in iteritems(self.DETECTORS):
+ for _n, detect in self.DETECTORS.items():
if detect.isAlias(requested):
return detect
sanslog.notice("getDetector: Detector " + requested + "not found")
diff --git a/scripts/SANS/sans/gui_logic/models/RowEntries.py b/scripts/SANS/sans/gui_logic/models/RowEntries.py
index ee35d192ec4..c35890ed7e7 100644
--- a/scripts/SANS/sans/gui_logic/models/RowEntries.py
+++ b/scripts/SANS/sans/gui_logic/models/RowEntries.py
@@ -4,7 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iteritems, iterkeys
+
+from six import iterkeys
from sans.common.enums import RowState, SampleShape
from sans.common.file_information import SANSFileInformationFactory
@@ -56,7 +57,7 @@ class RowEntries(_UserEntries):
self._start_observing = True # Allow init to use setattr without validation
- for k, v in iteritems(kwargs):
+ for k, v in kwargs.items():
setattr(self, k, v)
@property
diff --git a/scripts/test/IndirectCommonTests.py b/scripts/test/IndirectCommonTests.py
index 116828f364c..1aa67fd0895 100644
--- a/scripts/test/IndirectCommonTests.py
+++ b/scripts/test/IndirectCommonTests.py
@@ -322,7 +322,7 @@ class IndirectCommonTests(unittest.TestCase):
def assert_logs_match_expected(self, workspace, expected_logs):
run = mtd[workspace].getRun()
- for log_name, log_value in expected_logs.iteritems():
+ for log_name, log_value in expected_logs.items():
self.assertTrue(run.hasProperty(log_name),
"The log %s is missing from the workspace" % log_name)
self.assertEqual(str(run.getProperty(log_name).value), str(log_value),
diff --git a/scripts/test/Muon/elemental_analysis/load_utils_test.py b/scripts/test/Muon/elemental_analysis/load_utils_test.py
index 561e0e69990..d0cca4c3b82 100644
--- a/scripts/test/Muon/elemental_analysis/load_utils_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_utils_test.py
@@ -12,9 +12,6 @@ from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
import mantid.simpleapi as mantid
from mantid import config
import numpy as np
-from six import iteritems
-
-
class LoadUtilsTest(unittest.TestCase):
def setUp(self):
self.test_path = r"test\path\to\ral012345.rooth2020.dat"
@@ -26,7 +23,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_pad_run(self):
tests = {123: "00123", 0: "00000", 12345: "12345", 123456: "123456"}
- for run, padded_run in iteritems(tests):
+ for run, padded_run in tests.items():
self.assertEqual(lutils.pad_run(run), padded_run)
@mock.patch('Muon.GUI.ElementalAnalysis.LoadWidget.load_utils.glob.iglob')
@@ -67,7 +64,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_hyphenise(self):
tests = {"1-5": [1, 2, 3, 4, 5], "1, 4-5": [1, 4, 5], "1-3, 5": [1, 3, 2, 5], "1, 3, 5": [1, 5, 3]}
- for out, arg in iteritems(tests):
+ for out, arg in tests.items():
self.assertEqual(lutils.hyphenise(arg), out)
def test_merge_workspaces(self):
@@ -159,7 +156,7 @@ class LoadUtilsTest(unittest.TestCase):
def test_replace_workspace_name_suffix(self):
tests = {self.test_ws_name: "suffix", "_".join([self.test_ws_name, "test"]): "suffix"}
- for workspace_name, suffix in iteritems(tests):
+ for workspace_name, suffix in tests.items():
self.assertEquals(lutils.replace_workspace_name_suffix(workspace_name, suffix),
self.var_ws_name.format(1, suffix))
diff --git a/scripts/test/Muon/fit_parameters_test.py b/scripts/test/Muon/fit_parameters_test.py
index 50e6a45723d..7b953cefa12 100644
--- a/scripts/test/Muon/fit_parameters_test.py
+++ b/scripts/test/Muon/fit_parameters_test.py
@@ -7,7 +7,7 @@
from collections import OrderedDict
import unittest
-from mantid.py3compat import iteritems, mock
+from mantid.py3compat import mock
from Muon.GUI.Common.contexts.fitting_context import FitParameters
@@ -17,7 +17,7 @@ def create_test_fit_parameters(test_parameters, global_parameters=None):
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(test_parameters)]
+ } for name, (value, error) in test_parameters.items()]
parameter_workspace = mock.MagicMock()
parameter_workspace.workspace.__iter__.return_value = fit_table
diff --git a/scripts/test/Muon/fitting_context_test.py b/scripts/test/Muon/fitting_context_test.py
index f126a63ccdd..e60af0d45e1 100644
--- a/scripts/test/Muon/fitting_context_test.py
+++ b/scripts/test/Muon/fitting_context_test.py
@@ -10,7 +10,7 @@ from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import iteritems, mock
+from mantid.py3compat import mock
from Muon.GUI.Common.contexts.fitting_context import FittingContext, FitInformation, FitParameters
@@ -74,7 +74,7 @@ def create_test_fit_parameters(test_parameters, global_parameters=None):
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(test_parameters)]
+ } for name, (value, error) in test_parameters.items()]
parameter_workspace = mock.MagicMock()
parameter_workspace.workspace.__iter__.return_value = fit_table
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
index 39e2c149dc4..072a421fc8a 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
@@ -12,7 +12,7 @@ import unittest
from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import iteritems, mock, string_types
+from mantid.py3compat import mock, string_types
from mantid.simpleapi import Load
from mantidqt.utils.qt.testing import start_qapplication
@@ -49,7 +49,7 @@ def create_test_fits(input_workspaces,
'Name': name,
'Value': value,
'Error': error
- } for name, (value, error) in iteritems(parameters)]
+ } for name, (value, error) in parameters.items()]
fits = []
for name in input_workspaces:
diff --git a/tools/Documentation/wiki2rst.py b/tools/Documentation/wiki2rst.py
index 1855cfe9ef2..f0cff3f22a5 100755
--- a/tools/Documentation/wiki2rst.py
+++ b/tools/Documentation/wiki2rst.py
@@ -101,7 +101,7 @@ class WikiURL(object):
raise RuntimeError("Failed to fetch JSON describing image page: {}".format(str(err)))
apicall = json.loads(json_str)
pages = apicall['query']['pages']
- for _, page in pages.iteritems():
+ for _, page in pages.items():
return page['imageinfo'][0]['url']
# ------------------------------------------------------------------------------
--
GitLab
From 11fabb9dac8288a22d4899b413f93225d54ad228 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 15:35:49 +0000
Subject: [PATCH 05/37] RE #27722 Remove uses of itervalues imported from six
---
Testing/SystemTests/scripts/runSystemTests.py | 3 +--
docs/sphinxext/mantiddoc/directives/categories.py | 3 +--
.../workbench/workbench/plotting/globalfiguremanager.py | 2 +-
.../SANS/sans/gui_logic/models/batch_process_runner.py | 9 ++++-----
.../state/StateObjects/StateCalculateTransmission.py | 4 ++--
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/Testing/SystemTests/scripts/runSystemTests.py b/Testing/SystemTests/scripts/runSystemTests.py
index c5574d64283..c850a3c1cf0 100755
--- a/Testing/SystemTests/scripts/runSystemTests.py
+++ b/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:
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 0bcf6f245e7..188dda3454c 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/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)
diff --git a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
index a99d1f508ba..b273067b93e 100644
--- a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
+++ b/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
diff --git a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
index 4a15e81a4e9..d301d0a0dd9 100644
--- a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
+++ b/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, [], [])
diff --git a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
index f9ee0a2d04e..a594447c909 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
+++ b/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:
--
GitLab
From f4bd2ce881873b471fb044c7203e623947daa64c Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 15:44:33 +0000
Subject: [PATCH 06/37] RE #27722 remove iterkeys imported from six
---
scripts/Diffraction/isis_powder/routines/common.py | 4 ++--
.../isis_powder/test/ISISPowderAbsorptionTest.py | 4 ++--
scripts/Muon/GUI/Common/contexts/fitting_context.py | 4 ++--
scripts/SANS/sans/gui_logic/models/RowEntries.py | 4 +---
scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py | 6 ++----
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py
index 2b4271450cc..c7cba46e74b 100644
--- a/scripts/Diffraction/isis_powder/routines/common.py
+++ b/scripts/Diffraction/isis_powder/routines/common.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import PY2, iterkeys
+from six import PY2
import collections
import warnings
@@ -145,7 +145,7 @@ def dictionary_key_helper(dictionary, key, throws=True, case_insensitive=False,
if case_insensitive:
# Convert key to str
lower_key = str(key).lower()
- for dict_key in iterkeys(dictionary):
+ for dict_key in dictionary.keys():
if str(dict_key).lower() == lower_key:
# Found it
return dictionary[dict_key]
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
index 2171a8de15a..ffb238a4a74 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
@@ -7,7 +7,7 @@
import mantid.simpleapi as mantid
import unittest
-from six import iterkeys, assertRaisesRegex
+from six import assertRaisesRegex
from isis_powder.routines import absorb_corrections, SampleDetails
@@ -35,7 +35,7 @@ class ISISPowderAbsorptionTest(unittest.TestCase):
}
# Test each key one at a time
- for blacklisted_key in iterkeys(sample_properties):
+ for blacklisted_key in sample_properties.keys():
# Force python to make a shallow copy
modified_dict = sample_properties.copy()
modified_dict.pop(blacklisted_key)
diff --git a/scripts/Muon/GUI/Common/contexts/fitting_context.py b/scripts/Muon/GUI/Common/contexts/fitting_context.py
index 3fa5e62bc43..a94140ae5b6 100644
--- a/scripts/Muon/GUI/Common/contexts/fitting_context.py
+++ b/scripts/Muon/GUI/Common/contexts/fitting_context.py
@@ -8,7 +8,7 @@ from collections import OrderedDict
import re
from mantid.api import AnalysisDataService
-from mantid.py3compat import iterkeys, string_types
+from mantid.py3compat import string_types
import numpy as np
from mantidqt.utils.observer_pattern import Observable
@@ -58,7 +58,7 @@ def _create_unique_param_lookup(parameter_workspace, global_parameters):
return False, False
# Do we have this parameter already?
- for unique_name in iterkeys(unique_params):
+ for unique_name in unique_params.keys():
if is_same_parameter(unique_name, global_name):
return True, True
diff --git a/scripts/SANS/sans/gui_logic/models/RowEntries.py b/scripts/SANS/sans/gui_logic/models/RowEntries.py
index c35890ed7e7..3e602b7702a 100644
--- a/scripts/SANS/sans/gui_logic/models/RowEntries.py
+++ b/scripts/SANS/sans/gui_logic/models/RowEntries.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import iterkeys
-
from sans.common.enums import RowState, SampleShape
from sans.common.file_information import SANSFileInformationFactory
from sans.gui_logic.models.RowOptionsModel import RowOptionsModel
@@ -101,7 +99,7 @@ class RowEntries(_UserEntries):
self.can_scatter_period, self.can_transmission_period, self.can_direct_period))
def is_empty(self):
- return not any(getattr(self, attr) for attr in iterkeys(self._data_vars))
+ return not any(getattr(self, attr) for attr in self._data_vars.keys())
def reset_row_state(self):
self.state = RowState.UNPROCESSED
diff --git a/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py b/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
index 78a0bfb4ae5..8d552c92886 100644
--- a/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
+++ b/scripts/test/SANS/gui_logic/model_tests/RowEntriesTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from six import iterkeys
-
from sans.common.enums import RowState
from sans.gui_logic.models.RowEntries import RowEntries, _UserEntries
@@ -16,7 +14,7 @@ class RowEntriesTest(unittest.TestCase):
def test_settings_attr_resets_state(self):
observed_attrs = vars(_UserEntries())
- for observed_attr in iterkeys(observed_attrs):
+ for observed_attr in observed_attrs.keys():
obj = RowEntries()
obj.state = RowState.PROCESSED
setattr(obj, observed_attr, "")
@@ -47,7 +45,7 @@ class RowEntriesTest(unittest.TestCase):
blank_obj = RowEntries()
self.assertTrue(blank_obj.is_empty(), "Default Row Entries is not blank")
- for attr in iterkeys(vars(_UserEntries())):
+ for attr in vars(_UserEntries()).keys():
obj = RowEntries()
setattr(obj, attr, 1.0)
self.assertFalse(obj.is_empty())
--
GitLab
From a529b322a65fd2729bf10e8a7ecfa41e02828765 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:02:42 +0000
Subject: [PATCH 07/37] RE #27722 Remove with_metaclass imported from six
---
.../tests/analysis/ISISDirectInelastic.py | 5 +---
.../tests/analysis/ISISIndirectBayesTest.py | 4 +--
.../tests/analysis/ISISIndirectInelastic.py | 25 ++++++++-----------
.../tests/analysis/ISISMuonAnalysis.py | 4 +--
.../analysis/ISISMuonAnalysisGrouping.py | 4 +--
.../analysis/ISISReflInstrumentIDFTest.py | 5 +---
.../analysis/IndirectDiffractionTests.py | 5 +---
.../tests/analysis/LoadAndCheckBase.py | 5 +---
.../tests/analysis/ReflectometryISIS.py | 5 +---
.../tests/analysis/SaveLoadNexusProcessed.py | 4 +--
scripts/Interface/ui/sans_isis/beam_centre.py | 4 +--
.../ui/sans_isis/diagnostics_page.py | 4 +--
.../Interface/ui/sans_isis/masking_table.py | 4 +--
.../ui/sans_isis/sans_data_processor_gui.py | 4 +--
.../ui/sans_isis/settings_diagnostic_tab.py | 4 +--
.../Interface/ui/sans_isis/work_handler.py | 3 +--
.../Reflectometry/isis_reflectometry/quick.py | 5 +---
.../SANS/sans/algorithm_detail/load_data.py | 5 ++--
.../sans/algorithm_detail/mask_workspace.py | 4 +--
.../sans/algorithm_detail/merge_reductions.py | 4 +--
.../sans/algorithm_detail/move_workspaces.py | 3 +--
scripts/SANS/sans/common/file_information.py | 4 +--
.../sans/gui_logic/models/model_common.py | 4 +--
.../gui_logic/presenter/presenter_common.py | 5 +---
scripts/SANS/sans/state/AllStates.py | 4 +--
scripts/SANS/sans/state/IStateParser.py | 4 +--
.../state/StateObjects/StateAdjustment.py | 4 +--
.../StateCalculateTransmission.py | 6 ++---
.../state/StateObjects/StateCompatibility.py | 4 +--
.../state/StateObjects/StateConvertToQ.py | 4 +--
.../SANS/sans/state/StateObjects/StateData.py | 4 +--
.../state/StateObjects/StateMaskDetectors.py | 6 ++---
.../state/StateObjects/StateMoveDetectors.py | 6 ++---
.../StateObjects/StateNormalizeToMonitor.py | 4 +--
.../state/StateObjects/StateReductionMode.py | 4 +--
.../SANS/sans/state/StateObjects/StateSave.py | 4 +--
.../sans/state/StateObjects/StateScale.py | 4 +--
.../state/StateObjects/StateSliceEvent.py | 4 +--
.../state/StateObjects/StateWavelength.py | 4 +--
.../StateWavelengthAndPixelAdjustment.py | 6 ++---
scripts/SANS/sans/test_helper/mock_objects.py | 4 +--
scripts/test/SANS/state/JsonSerializerTest.py | 12 ++++-----
42 files changed, 63 insertions(+), 148 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index aad4080c473..2138169c8ed 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -13,11 +13,8 @@ import shutil
from abc import ABCMeta, abstractmethod
from Direct.PropertyManager import PropertyManager
-from six import with_metaclass
-
-
#----------------------------------------------------------------------
-class ISISDirectInelasticReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISDirectInelasticReduction(metaclass=ABCMeta):
"""A base class for the ISIS direct inelastic tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
index 31ec170f5a4..bf83242817d 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
@@ -12,8 +12,6 @@ import os
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
import platform
-from six import with_metaclass
-
#==============================================================================
@@ -327,7 +325,7 @@ class QLWidthTest(systemtesting.MantidSystemTest):
#==============================================================================
-class JumpFitFunctionTestBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class JumpFitFunctionTestBase(metaclass=ABCMeta):
def __init__(self):
systemtesting.MantidSystemTest.__init__(self)
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index ea2a0659460..94070c61e17 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -81,10 +81,7 @@ from mantid.simpleapi import *
from mantid.api import FileFinder
from systemtesting import MantidSystemTest, using_gsl_v1
-from six import with_metaclass
-
-
-class ISISIndirectInelasticBase(with_metaclass(ABCMeta, MantidSystemTest)):
+class ISISIndirectInelasticBase(metaclass=ABCMeta):
'''
A common base class for the ISISIndirectInelastic* base classes.
'''
@@ -156,7 +153,7 @@ class ISISIndirectInelasticBase(with_metaclass(ABCMeta, MantidSystemTest)):
#==============================================================================
-class ISISIndirectInelasticReduction(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticReduction(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic reduction tests
The workflow is defined in the _run() method, simply
@@ -385,7 +382,7 @@ class IRISMultiFileSummedReduction(ISISIndirectInelasticReduction):
#==============================================================================
-class ISISIndirectInelasticCalibration(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticCalibration(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic calibration tests
The workflow is defined in the _run() method, simply
@@ -456,7 +453,7 @@ class IRISCalibration(ISISIndirectInelasticCalibration):
#==============================================================================
-class ISISIndirectInelasticResolution(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticResolution(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic resolution tests
The workflow is defined in the _run() method, simply
@@ -544,7 +541,7 @@ class IRISResolution(ISISIndirectInelasticResolution):
#==============================================================================
-class ISISIndirectInelasticDiagnostics(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticDiagnostics(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic diagnostic tests
The workflow is defined in the _run() method, simply
@@ -618,7 +615,7 @@ class OSIRISDiagnostics(ISISIndirectInelasticDiagnostics):
#==============================================================================
-class ISISIndirectInelasticMoments(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticMoments(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic TransformToIqt/TransformToIqtFit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -682,7 +679,7 @@ class IRISMoments(ISISIndirectInelasticMoments):
#==============================================================================
-class ISISIndirectInelasticElwinAndMSDFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticElwinAndMSDFit(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic Elwin/MSD Fit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -784,7 +781,7 @@ class IRISElwinAndMSDFit(ISISIndirectInelasticElwinAndMSDFit):
#==============================================================================
-class ISISIndirectInelasticIqtAndIqtFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticIqtAndIqtFit(metaclass=ABCMeta):
'''
A base class for the ISIS indirect inelastic Iqt/IqtFit tests
@@ -908,7 +905,7 @@ class IRISIqtAndIqtFit(ISISIndirectInelasticIqtAndIqtFit):
#==============================================================================
-class ISISIndirectInelasticIqtAndIqtFitMulti(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticIqtAndIqtFitMulti(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic Iqt/IqtFit tests
The output of Elwin is usually used with MSDFit and so we plug one into
@@ -1042,7 +1039,7 @@ class IRISIqtAndIqtFitMulti(ISISIndirectInelasticIqtAndIqtFitMulti):
#==============================================================================
-class ISISIndirectInelasticConvFit(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticConvFit(metaclass=ABCMeta):
'''A base class for the ISIS indirect inelastic ConvFit tests
The workflow is defined in the _run() method, simply
@@ -1147,7 +1144,7 @@ class IRISConvFit(ISISIndirectInelasticConvFit):
# Transmission Monitor Test
-class ISISIndirectInelasticTransmissionMonitor(with_metaclass(ABCMeta, ISISIndirectInelasticBase)):
+class ISISIndirectInelasticTransmissionMonitor(metaclass=ABCMeta):
# Mark as an abstract class
def _run(self):
'''Defines the workflow for the test'''
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index c56feb54e44..327f8e4cb87 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -10,12 +10,10 @@ import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
#----------------------------------------------------------------------
-class ISISMuonAnalysis(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISMuonAnalysis(metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index 247e6592b9d..d38268982da 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -9,12 +9,10 @@ import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
#----------------------------------------------------------------------
-class ISISMuonAnalysisGrouping(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISMuonAnalysisGrouping(metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index 7e2fd4d53b4..0df9ac4267e 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -13,10 +13,7 @@ import systemtesting
from mantid.simpleapi import *
import os
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
-
-class ISISReflInstrumentIDFTest(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISReflInstrumentIDFTest(metaclass=ABCMeta):
@abstractmethod
def get_IDF_name(self):
diff --git a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index e0727f22b2c..1a9f53d0b6e 100644
--- a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -10,10 +10,7 @@ from abc import ABCMeta, abstractmethod
import systemtesting
import mantid.simpleapi as ms
from mantid import mtd
-from six import with_metaclass
-
-
-class ISISIndirectDiffractionReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ISISIndirectDiffractionReduction(metaclass=ABCMeta):
"""
Base class for tests that use the ISISIndirectDiffractionReduction algorithm.
"""
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 24d26f6b066..9be0eae5aa7 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -14,10 +14,7 @@ from mantid.simpleapi import *
import mantid.api
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
-
-class LoadAndCheckBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class LoadAndCheckBase(metaclass=ABCMeta):
__comparison_out_workspace_name = 'a_integrated'
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 6926bc68527..762a2d69e24 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -13,10 +13,7 @@ import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
-
-class ReflectometryISIS(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class ReflectometryISIS(metaclass=ABCMeta):
@abstractmethod
def get_workspace_name(self):
diff --git a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
index d610fa0e76a..815b49c801b 100644
--- a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
+++ b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import ABCMeta, abstractmethod
import os
-from six import with_metaclass
-
import systemtesting
from mantid.simpleapi import *
from mantid import config
@@ -22,7 +20,7 @@ def create_file_path(base_name):
return filename
-class SaveLoadNexusProcessedTestBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
+class SaveLoadNexusProcessedTestBase(metaclass=ABCMeta):
filename = None
test_ws_name = 'input_ws'
diff --git a/scripts/Interface/ui/sans_isis/beam_centre.py b/scripts/Interface/ui/sans_isis/beam_centre.py
index c755d4f1aa3..531693b47c6 100644
--- a/scripts/Interface/ui/sans_isis/beam_centre.py
+++ b/scripts/Interface/ui/sans_isis/beam_centre.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import ABCMeta, abstractmethod
from qtpy import QtGui, QtCore, QtWidgets
-from six import with_metaclass
-
from mantidqt.utils.qt import load_ui
from mantidqt.widgets import messagedisplay
@@ -26,7 +24,7 @@ Ui_BeamCentre, _ = load_ui(__file__, "beam_centre.ui")
class BeamCentre(QtWidgets.QWidget, Ui_BeamCentre):
- class BeamCentreListener(with_metaclass(ABCMeta, object)):
+ class BeamCentreListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the beam centre finder
"""
diff --git a/scripts/Interface/ui/sans_isis/diagnostics_page.py b/scripts/Interface/ui/sans_isis/diagnostics_page.py
index 70ba24c8942..e32925663e9 100644
--- a/scripts/Interface/ui/sans_isis/diagnostics_page.py
+++ b/scripts/Interface/ui/sans_isis/diagnostics_page.py
@@ -8,8 +8,6 @@ from abc import ABCMeta, abstractmethod
from qtpy import QtCore, QtWidgets
from mantidqt.utils.qt import load_ui
-from six import with_metaclass
-
from sans.gui_logic.gui_common import (load_file, GENERIC_SETTINGS)
try:
@@ -22,7 +20,7 @@ Ui_DiagnosticsPage, _ = load_ui(__file__, "diagnostics_page.ui")
class DiagnosticsPage(QtWidgets.QWidget, Ui_DiagnosticsPage):
- class DiagnosticsPageListener(with_metaclass(ABCMeta, object)):
+ class DiagnosticsPageListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the beam centre finder
"""
diff --git a/scripts/Interface/ui/sans_isis/masking_table.py b/scripts/Interface/ui/sans_isis/masking_table.py
index fd111261fca..df07e525946 100644
--- a/scripts/Interface/ui/sans_isis/masking_table.py
+++ b/scripts/Interface/ui/sans_isis/masking_table.py
@@ -12,15 +12,13 @@ and masked SANS workspace.
from abc import ABCMeta, abstractmethod
from qtpy import QtWidgets
-from six import with_metaclass
-
from mantidqt.utils.qt import load_ui
Ui_MaskingTable, _ = load_ui(__file__, "masking_table.ui")
class MaskingTable(QtWidgets.QWidget, Ui_MaskingTable):
- class MaskingTableListener(with_metaclass(ABCMeta, object)):
+ class MaskingTableListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the masking table
"""
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index cd2daf64b76..74227738b4e 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -13,8 +13,6 @@ from abc import ABCMeta, abstractmethod
from qtpy.QtCore import QRegExp
from qtpy.QtGui import (QDoubleValidator, QIntValidator, QRegExpValidator)
from qtpy.QtWidgets import (QListWidgetItem, QMessageBox, QFileDialog, QMainWindow)
-from six import with_metaclass
-
from mantid.kernel import (Logger, UsageService, FeatureType)
from mantid.py3compat import Enum
from mantidqt import icons
@@ -55,7 +53,7 @@ class SANSDataProcessorGui(QMainWindow,
MULTI_PERIOD_COLUMNS = ["SSP", "STP", "SDP", "CSP", "CTP", "CDP"]
- class RunTabListener(with_metaclass(ABCMeta, object)):
+ class RunTabListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to in this View
"""
diff --git a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
index 4fa4a9d5eec..ceea88f193a 100644
--- a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
+++ b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
@@ -14,7 +14,7 @@ and helps the developer to identify issues.
from abc import ABCMeta, abstractmethod
import os
from qtpy import QtWidgets
-from six import with_metaclass, PY3
+from six import PY3
from mantidqt.utils.qt import load_ui
@@ -29,7 +29,7 @@ Ui_SettingsDiagnosticTab, _ = load_ui(__file__, "settings_diagnostic_tab.ui")
class SettingsDiagnosticTab(QtWidgets.QWidget, Ui_SettingsDiagnosticTab):
- class SettingsDiagnosticTabListener(with_metaclass(ABCMeta, object)):
+ class SettingsDiagnosticTabListener(metaclass=ABCMeta):
"""
Defines the elements which a presenter can listen to for the diagnostic tab
"""
diff --git a/scripts/Interface/ui/sans_isis/work_handler.py b/scripts/Interface/ui/sans_isis/work_handler.py
index 1628d5e24b8..6945ad09ff3 100644
--- a/scripts/Interface/ui/sans_isis/work_handler.py
+++ b/scripts/Interface/ui/sans_isis/work_handler.py
@@ -16,7 +16,6 @@ worker, or the worker finishing its task) using the nested class WorkListener.
"""
from qtpy.QtCore import Slot, QThreadPool
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
import functools
import uuid
@@ -32,7 +31,7 @@ class WorkHandler(object):
an ID which is then used to identify the Worker through the API.
"""
- class WorkListener(with_metaclass(ABCMeta, object)):
+ class WorkListener(metaclass=ABCMeta):
"""
This abstract base class defines methods which must be overriden and which
handle responses to certain worker actions such as raised errors, or completion.
diff --git a/scripts/Reflectometry/isis_reflectometry/quick.py b/scripts/Reflectometry/isis_reflectometry/quick.py
index 20216e7b638..533dbf37377 100644
--- a/scripts/Reflectometry/isis_reflectometry/quick.py
+++ b/scripts/Reflectometry/isis_reflectometry/quick.py
@@ -25,9 +25,6 @@ from isis_reflectometry.convert_to_wavelength import ConvertToWavelength
import math
import re
import abc
-from six import with_metaclass
-
-
def enum(**enums):
return type('Enum', (), enums)
@@ -35,7 +32,7 @@ def enum(**enums):
PolarisationCorrection = enum(PNR=1, PA=2, NONE=3)
-class CorrectionStrategy(with_metaclass(abc.ABCMeta, object)):
+class CorrectionStrategy(metaclass=abc.ABCMeta):
@abc.abstractmethod
def apply(self, to_correct):
pass
diff --git a/scripts/SANS/sans/algorithm_detail/load_data.py b/scripts/SANS/sans/algorithm_detail/load_data.py
index b31f0e49e16..4e75f0193b6 100644
--- a/scripts/SANS/sans/algorithm_detail/load_data.py
+++ b/scripts/SANS/sans/algorithm_detail/load_data.py
@@ -49,7 +49,6 @@ Reading from the cache is supported for all files. This avoids data reloads if t
cache.
"""
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
import os
from mantid.kernel import config
from mantid.api import (AnalysisDataService)
@@ -688,7 +687,7 @@ def load_isis(data_type, file_information, period, use_cached, calibration_file_
# ----------------------------------------------------------------------------------------------------------------------
# Load classes
# ----------------------------------------------------------------------------------------------------------------------
-class SANSLoadData(with_metaclass(ABCMeta, object)):
+class SANSLoadData(metaclass=ABCMeta):
""" Base class for all SANSLoad implementations."""
@abstractmethod
def do_execute(self, data_info, use_cached, publish_to_ads, progress, parent_alg):
@@ -788,7 +787,7 @@ class SANSLoadDataFactory(object):
# Corrections for a loaded transmission workspace
# -------------------------------------------------
-class TransmissionCorrection(with_metaclass(ABCMeta, object)):
+class TransmissionCorrection(metaclass=ABCMeta):
@abstractmethod
def correct(self, workspaces, parent_alg):
pass
diff --git a/scripts/SANS/sans/algorithm_detail/mask_workspace.py b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
index a1d18cbf8f5..8457a49c321 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_workspace.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_workspace.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
-
from mantid.kernel import Logger
from sans.algorithm_detail.mask_functions import SpectraBlock
@@ -354,7 +352,7 @@ def mask_beam_stop(mask_info, workspace, instrument, detector_names):
# Masker classes
# ------------------------------------------------------------------
-class Masker(with_metaclass(ABCMeta, object)):
+class Masker(metaclass=ABCMeta):
def __init__(self):
super(Masker, self).__init__()
diff --git a/scripts/SANS/sans/algorithm_detail/merge_reductions.py b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
index ba95fefd8d6..064e57965e6 100644
--- a/scripts/SANS/sans/algorithm_detail/merge_reductions.py
+++ b/scripts/SANS/sans/algorithm_detail/merge_reductions.py
@@ -8,15 +8,13 @@
from abc import (ABCMeta, abstractmethod)
-from six import with_metaclass
-
import mantid.simpleapi as mantid_api
from sans.algorithm_detail.bundles import MergeBundle
from sans.common.enums import (SANSFacility, DataType)
from sans.common.general_functions import create_child_algorithm
-class Merger(with_metaclass(ABCMeta, object)):
+class Merger(metaclass=ABCMeta):
""" Merger interface"""
@abstractmethod
diff --git a/scripts/SANS/sans/algorithm_detail/move_workspaces.py b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
index 37cd5694a91..89c42c5e6cd 100644
--- a/scripts/SANS/sans/algorithm_detail/move_workspaces.py
+++ b/scripts/SANS/sans/algorithm_detail/move_workspaces.py
@@ -8,7 +8,6 @@
import math
from mantid.api import MatrixWorkspace
-from six import with_metaclass
from abc import (ABCMeta, abstractmethod)
from sans.state.StateObjects.StateMoveDetectors import StateMove
from sans.common.enums import CanonicalCoordinates, DetectorType, SANSInstrument
@@ -333,7 +332,7 @@ def move_low_angle_bank_for_SANS2D_and_ZOOM(move_info, workspace, coordinates, u
# -------------------------------------------------
# Move classes
# -------------------------------------------------
-class SANSMove(with_metaclass(ABCMeta, object)):
+class SANSMove(metaclass=ABCMeta):
def __init__(self):
super(SANSMove, self).__init__()
diff --git a/scripts/SANS/sans/common/file_information.py b/scripts/SANS/sans/common/file_information.py
index 5e6c6b36abf..314e7fe90fb 100644
--- a/scripts/SANS/sans/common/file_information.py
+++ b/scripts/SANS/sans/common/file_information.py
@@ -17,8 +17,6 @@ from mantid.kernel import (DateAndTime, ConfigService, Logger)
from mantid.api import (AlgorithmManager, ExperimentInfo)
from sans.common.enums import (SANSInstrument, FileType, SampleShape)
from sans.common.general_functions import (get_instrument, instrument_name_correction, get_facility)
-from six import with_metaclass
-
# ----------------------------------------------------------------------------------------------------------------------
# Constants
# ----------------------------------------------------------------------------------------------------------------------
@@ -718,7 +716,7 @@ def get_geometry_information_raw(file_name):
# ----------------------------------------------------------------------------------------------------------------------
# SANS file Information
# ----------------------------------------------------------------------------------------------------------------------
-class SANSFileInformation(with_metaclass(ABCMeta, object)):
+class SANSFileInformation(metaclass=ABCMeta):
logger = Logger("SANS")
def __init__(self, full_file_name):
diff --git a/scripts/SANS/sans/gui_logic/models/model_common.py b/scripts/SANS/sans/gui_logic/models/model_common.py
index 46f5bd26a98..d78acffcabf 100644
--- a/scripts/SANS/sans/gui_logic/models/model_common.py
+++ b/scripts/SANS/sans/gui_logic/models/model_common.py
@@ -6,13 +6,11 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The settings diagnostic tab which visualizes the SANS state object. """
from abc import ABCMeta
-from six import with_metaclass
-
from sans.common.enums import SANSInstrument
from sans.user_file.settings_tags import MonId, monitor_spectrum, DetectorId
-class ModelCommon(with_metaclass(ABCMeta)):
+class ModelCommon(metaclass=ABCMeta):
def __init__(self, user_file_items):
# Workaround to avoid refactoring becoming impossibly large
# TODO this should be encapsulated in sub-models
diff --git a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
index 7cb3fd2838e..37248411d7b 100644
--- a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
+++ b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
@@ -11,10 +11,7 @@ the view or retrieve them from the view
"""
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
-
-class PresenterCommon(with_metaclass(ABCMeta)):
+class PresenterCommon(metaclass=ABCMeta):
def __init__(self, view, model):
self._view = view
self._model = model
diff --git a/scripts/SANS/sans/state/AllStates.py b/scripts/SANS/sans/state/AllStates.py
index c9c84579356..43c56bee76e 100644
--- a/scripts/SANS/sans/state/AllStates.py
+++ b/scripts/SANS/sans/state/AllStates.py
@@ -8,8 +8,6 @@
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import SANSFacility
from sans.state.JsonSerializable import JsonSerializable
from sans.state.StateObjects.StateCompatibility import get_compatibility_builder
@@ -22,7 +20,7 @@ from sans.state.automatic_setters import automatic_setters
# State
# ----------------------------------------------------------------------------------------------------------------------
-class AllStates(with_metaclass(JsonSerializable)):
+class AllStates(metaclass=JsonSerializable):
def __init__(self):
diff --git a/scripts/SANS/sans/state/IStateParser.py b/scripts/SANS/sans/state/IStateParser.py
index 113027855f6..5471192a726 100644
--- a/scripts/SANS/sans/state/IStateParser.py
+++ b/scripts/SANS/sans/state/IStateParser.py
@@ -6,12 +6,10 @@
# SPDX - License - Identifier: GPL - 3.0 +
from abc import ABCMeta, abstractmethod
-from six import with_metaclass
-
from sans.state.AllStates import AllStates
-class IStateParser(with_metaclass(ABCMeta)):
+class IStateParser(metaclass=ABCMeta):
def get_all_states(self): # -> AllStates
all_states = AllStates()
all_states.data = self.get_state_data()
diff --git a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
index 5060c790fd8..9f47aa83cf2 100644
--- a/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateAdjustment.py
@@ -11,14 +11,12 @@
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import SANSFacility
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
-class StateAdjustment(with_metaclass(JsonSerializable)):
+class StateAdjustment(metaclass=JsonSerializable):
def __init__(self):
super(StateAdjustment, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
index a594447c909..254046d311e 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
@@ -11,7 +11,7 @@
import json
import copy
import abc
-from six import with_metaclass, add_metaclass
+from six import add_metaclass
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSInstrument)
@@ -22,7 +22,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, validation_mes
from sans.common.xml_parsing import get_named_elements_from_ipf_file
-class StateTransmissionFit(with_metaclass(JsonSerializable)):
+class StateTransmissionFit(metaclass=JsonSerializable):
def __init__(self):
super(StateTransmissionFit, self).__init__()
@@ -58,7 +58,7 @@ class StateTransmissionFit(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateCalculateTransmission(with_metaclass(JsonSerializable)):
+class StateCalculateTransmission(metaclass=JsonSerializable):
def __init__(self):
super(StateCalculateTransmission, self).__init__()
# -----------------------
diff --git a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
index 118cefcd746..9ca7c67d949 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCompatibility.py
@@ -14,8 +14,6 @@
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SANSFacility
@@ -27,7 +25,7 @@ from sans.common.enums import SANSFacility
from sans.state.automatic_setters import automatic_setters
-class StateCompatibility(with_metaclass(JsonSerializable)):
+class StateCompatibility(metaclass=JsonSerializable):
def __init__(self):
super(StateCompatibility, self).__init__()
self.use_compatibility_mode = False # : Bool
diff --git a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
index 05091709fa0..c569f22241c 100644
--- a/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
+++ b/scripts/SANS/sans/state/StateObjects/StateConvertToQ.py
@@ -11,8 +11,6 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (ReductionDimensionality, RangeStepType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
@@ -24,7 +22,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, is_not_none_an
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateConvertToQ(with_metaclass(JsonSerializable)):
+class StateConvertToQ(metaclass=JsonSerializable):
def __init__(self):
super(StateConvertToQ, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateData.py b/scripts/SANS/sans/state/StateObjects/StateData.py
index 3fbeb4c4d46..b56dbdbaedb 100644
--- a/scripts/SANS/sans/state/StateObjects/StateData.py
+++ b/scripts/SANS/sans/state/StateObjects/StateData.py
@@ -10,8 +10,6 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SANSFacility, SANSInstrument
import sans.common.constants
@@ -23,7 +21,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, validation_mes
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateData(with_metaclass(JsonSerializable)):
+class StateData(metaclass=JsonSerializable):
ALL_PERIODS = sans.common.constants.ALL_PERIODS
def __init__(self):
diff --git a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
index 75e21dcbce7..5d97c566ea9 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMaskDetectors.py
@@ -11,8 +11,6 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_pure_none_or_not_none, validation_message, set_detector_names)
@@ -82,7 +80,7 @@ def is_spectrum_range_all_on_one_detector(start, stop, invalid_dict, start_name,
# StateData
# ------------------------------------------------
-class StateMaskDetectors(with_metaclass(JsonSerializable)):
+class StateMaskDetectors(metaclass=JsonSerializable):
def __init__(self):
super(StateMaskDetectors, self).__init__()
# Vertical strip masks
@@ -170,7 +168,7 @@ class StateMaskDetectors(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateMask(with_metaclass(JsonSerializable)):
+class StateMask(metaclass=JsonSerializable):
def __init__(self):
super(StateMask, self).__init__()
# Radius Mask
diff --git a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
index 1217c831d31..8f40b5f1583 100644
--- a/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
+++ b/scripts/SANS/sans/state/StateObjects/StateMoveDetectors.py
@@ -11,8 +11,6 @@
import copy
import json
-from six import with_metaclass
-
from sans.common.enums import (CanonicalCoordinates, SANSInstrument, DetectorType)
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
@@ -23,7 +21,7 @@ from sans.state.state_functions import (validation_message, set_detector_names,
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateMoveDetectors(with_metaclass(JsonSerializable)):
+class StateMoveDetectors(metaclass=JsonSerializable):
def __init__(self):
super(StateMoveDetectors, self).__init__()
# Translation correction
@@ -64,7 +62,7 @@ class StateMoveDetectors(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateMove(with_metaclass(JsonSerializable)):
+class StateMove(metaclass=JsonSerializable):
def __init__(self):
super(StateMove, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
index 7a732d99381..ad936dbd582 100644
--- a/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
+++ b/scripts/SANS/sans/state/StateObjects/StateNormalizeToMonitor.py
@@ -11,8 +11,6 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, SANSInstrument)
from sans.state.automatic_setters import automatic_setters
@@ -21,7 +19,7 @@ from sans.state.state_functions import (is_pure_none_or_not_none, is_not_none_an
from sans.common.xml_parsing import get_named_elements_from_ipf_file
-class StateNormalizeToMonitor(with_metaclass(JsonSerializable)):
+class StateNormalizeToMonitor(metaclass=JsonSerializable):
def __init__(self):
super(StateNormalizeToMonitor, self).__init__()
self.prompt_peak_correction_min = None # : Float (Optional)
diff --git a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
index 27aa502a57f..8f42a8b05f4 100644
--- a/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
+++ b/scripts/SANS/sans/state/StateObjects/StateReductionMode.py
@@ -9,8 +9,6 @@
import copy
import json
-from six import (with_metaclass)
-
from sans.common.enums import (ReductionMode, ReductionDimensionality, FitModeForMerge,
SANSFacility, DetectorType)
from sans.common.xml_parsing import get_named_elements_from_ipf_file
@@ -18,7 +16,7 @@ from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
-class StateReductionMode(with_metaclass(JsonSerializable)):
+class StateReductionMode(metaclass=JsonSerializable):
def __init__(self):
super(StateReductionMode, self).__init__()
self.reduction_mode = ReductionMode.LAB
diff --git a/scripts/SANS/sans/state/StateObjects/StateSave.py b/scripts/SANS/sans/state/StateObjects/StateSave.py
index 663699996b2..5309ea1cf56 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSave.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSave.py
@@ -10,14 +10,12 @@
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (SaveType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
-class StateSave(with_metaclass(JsonSerializable)):
+class StateSave(metaclass=JsonSerializable):
def __init__(self):
super(StateSave, self).__init__()
self.zero_free_correction = True # : Bool
diff --git a/scripts/SANS/sans/state/StateObjects/StateScale.py b/scripts/SANS/sans/state/StateObjects/StateScale.py
index e3fd330bc23..f54dad2b683 100644
--- a/scripts/SANS/sans/state/StateObjects/StateScale.py
+++ b/scripts/SANS/sans/state/StateObjects/StateScale.py
@@ -8,8 +8,6 @@
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import SampleShape, SANSFacility
@@ -20,7 +18,7 @@ from sans.common.enums import SampleShape, SANSFacility
from sans.state.automatic_setters import automatic_setters
-class StateScale(with_metaclass(JsonSerializable)):
+class StateScale(metaclass=JsonSerializable):
def __init__(self):
super(StateScale, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
index b41bc167259..bb31aaa8354 100644
--- a/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
+++ b/scripts/SANS/sans/state/StateObjects/StateSliceEvent.py
@@ -9,8 +9,6 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_pure_none_or_not_none, validation_message)
@@ -21,7 +19,7 @@ from sans.common.enums import SANSFacility
# State
# ----------------------------------------------------------------------------------------------------------------------
-class StateSliceEvent(with_metaclass(JsonSerializable)):
+class StateSliceEvent(metaclass=JsonSerializable):
def __init__(self):
super(StateSliceEvent, self).__init__()
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelength.py b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
index a5df4085084..0e35502c83b 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelength.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelength.py
@@ -9,15 +9,13 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, SANSFacility)
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_not_none_and_first_larger_than_second, one_is_none, validation_message)
-class StateWavelength(with_metaclass(JsonSerializable)):
+class StateWavelength(metaclass=JsonSerializable):
def __init__(self):
super(StateWavelength, self).__init__()
self.rebin_type = RebinType.REBIN
diff --git a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
index 443d8212b18..b7248b14819 100644
--- a/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
+++ b/scripts/SANS/sans/state/StateObjects/StateWavelengthAndPixelAdjustment.py
@@ -11,15 +11,13 @@
import json
import copy
-from six import with_metaclass
-
from sans.state.JsonSerializable import JsonSerializable
from sans.state.automatic_setters import automatic_setters
from sans.state.state_functions import (is_not_none_and_first_larger_than_second, one_is_none, validation_message)
from sans.common.enums import (RangeStepType, DetectorType, SANSFacility)
-class StateAdjustmentFiles(with_metaclass(JsonSerializable)):
+class StateAdjustmentFiles(metaclass=JsonSerializable):
def __init__(self):
super(StateAdjustmentFiles, self).__init__()
self.pixel_adjustment_file = None # : Str()
@@ -35,7 +33,7 @@ class StateAdjustmentFiles(with_metaclass(JsonSerializable)):
"Please see: {0}".format(json.dumps(is_invalid)))
-class StateWavelengthAndPixelAdjustment(with_metaclass(JsonSerializable)):
+class StateWavelengthAndPixelAdjustment(metaclass=JsonSerializable):
def __init__(self):
super(StateWavelengthAndPixelAdjustment, self).__init__()
self.wavelength_low = None # : List[Float] (Positive)
diff --git a/scripts/SANS/sans/test_helper/mock_objects.py b/scripts/SANS/sans/test_helper/mock_objects.py
index e2ac44219ec..b67ac9a3502 100644
--- a/scripts/SANS/sans/test_helper/mock_objects.py
+++ b/scripts/SANS/sans/test_helper/mock_objects.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from functools import (partial)
-from six import with_metaclass
-
from mantid.py3compat import mock
from sans.gui_logic.presenter.run_tab_presenter import RunTabPresenter
from sans.common.enums import (RangeStepType, OutputMode, SANSFacility, SANSInstrument)
@@ -238,7 +236,7 @@ def create_mock_view2(user_file_path, batch_file_path=None):
return view
-class FakeState(with_metaclass(JsonSerializable)):
+class FakeState(metaclass=JsonSerializable):
def __init__(self):
super(FakeState, self).__init__()
self.dummy_state = "dummy_state"
diff --git a/scripts/test/SANS/state/JsonSerializerTest.py b/scripts/test/SANS/state/JsonSerializerTest.py
index 10e3b44573f..139795615bb 100644
--- a/scripts/test/SANS/state/JsonSerializerTest.py
+++ b/scripts/test/SANS/state/JsonSerializerTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from six import with_metaclass
-
from mantid.api import Algorithm
from mantid.py3compat import Enum
@@ -21,7 +19,7 @@ from sans.state.JsonSerializable import JsonSerializable, json_serializable
from sans.state.Serializer import Serializer
-class TestClass(with_metaclass(JsonSerializable)):
+class TestClass(metaclass=JsonSerializable):
string_parameter = None # : Str()
bool_parameter = None # : Bool
float_parameter = None # : Float
@@ -47,7 +45,7 @@ class FakeEnumClass(Enum):
BAR = "2"
-class ExampleWrapper(with_metaclass(JsonSerializable)):
+class ExampleWrapper(metaclass=JsonSerializable):
# This has to be at the top module level, else the module name finding will fail
def __init__(self):
self._foo = FakeEnumClass.FOO
@@ -57,7 +55,7 @@ class ExampleWrapper(with_metaclass(JsonSerializable)):
return True
-class VerySimpleState(with_metaclass(JsonSerializable)):
+class VerySimpleState(metaclass=JsonSerializable):
string_parameter = None # : Str()
def __init__(self):
@@ -68,7 +66,7 @@ class VerySimpleState(with_metaclass(JsonSerializable)):
pass
-class SimpleState(with_metaclass(JsonSerializable)):
+class SimpleState(metaclass=JsonSerializable):
def __init__(self):
super(SimpleState, self).__init__()
self.string_parameter = "String_in_SimpleState"
@@ -88,7 +86,7 @@ class SimpleState(with_metaclass(JsonSerializable)):
pass
-class ComplexState(with_metaclass(JsonSerializable)):
+class ComplexState(metaclass=JsonSerializable):
def __init__(self):
super(ComplexState, self).__init__()
self.float_parameter = 23.
--
GitLab
From f1205c5a1de5c918332a0979183f89e91dafdba7 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:18:43 +0000
Subject: [PATCH 08/37] RE #27722 Remove string_types inported from six
---
.../mantid/plots/plotfunctions.py | 4 +-
.../mantid/py3compat/__init__.py | 2 +-
.../plugins/algorithms/LRAutoReduction.py | 5 +--
.../python/mantid/kernel/UnitLabelTest.py | 2 +-
.../CalibrateRectangularDetector_Test.py | 7 +---
.../recoverygui/projectrecoverymodel.py | 2 +-
.../utils/workspacehistorygeneration.py | 2 +-
.../utils/qt/testing/gui_test_runner.py | 4 +-
.../mantidqt/widgets/codeeditor/completion.py | 6 +--
.../polaris_routines/polaris_algs.py | 4 +-
scripts/Inelastic/CrystalField/fitting.py | 7 +---
scripts/Inelastic/CrystalField/function.py | 8 ++--
.../Inelastic/CrystalField/normalisation.py | 5 +--
scripts/Inelastic/CrystalField/pointcharge.py | 3 +-
scripts/Inelastic/Direct/AbsorptionShapes.py | 8 ++--
.../Direct/DirectEnergyConversion.py | 3 +-
.../Direct/ISISDirecInelasticConfig.py | 8 ++--
scripts/Inelastic/Direct/NonIDF_Properties.py | 3 +-
.../Inelastic/Direct/PropertiesDescriptors.py | 40 +++++++++----------
scripts/Inelastic/Direct/PropertyManager.py | 3 +-
scripts/Inelastic/Direct/ReductionHelpers.py | 7 ++--
scripts/Inelastic/Direct/ReductionWrapper.py | 16 ++++----
scripts/Inelastic/Direct/RunDescriptor.py | 13 +++---
scripts/Inelastic/Direct/diagnostics.py | 3 +-
.../GUI/Common/contexts/fitting_context.py | 5 +--
scripts/Muon/GUI/Common/muon_group.py | 2 +-
scripts/PyChop/Instruments.py | 3 +-
scripts/PyChop/MulpyRep.py | 5 +--
scripts/PyChop/PyChopGui.py | 3 +-
scripts/SANS/sans/common/log_tagger.py | 5 +--
scripts/SANS/sans/state/Serializer.py | 2 +-
.../results_tab_model_test.py | 4 +-
32 files changed, 79 insertions(+), 115 deletions(-)
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index 5821940d2c2..ac641f67f42 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -18,7 +18,7 @@ from matplotlib.legend import Legend
from mantid.api import AnalysisDataService, MatrixWorkspace
from mantid.kernel import ConfigService
from mantid.plots import datafunctions, MantidAxes
-from mantid.py3compat import is_text_string, string_types
+from mantid.py3compat import is_text_string
# -----------------------------------------------------------------------------
# Constants
@@ -350,7 +350,7 @@ def _validate_workspace_names(workspaces):
:return: A list of workspaces
"""
try:
- raise_if_not_sequence(workspaces, 'workspaces', string_types)
+ raise_if_not_sequence(workspaces, 'workspaces', str)
except ValueError:
return workspaces
else:
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index cf88d6fba0f..5df53aa7416 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -90,7 +90,7 @@ if not hasattr(six, "ensure_str"):
def is_text_string(obj):
"""Return True if `obj` is a text string, False if it is anything else,
like binary data (Python 3) or QString (Python 2, PyQt API #1)"""
- return isinstance(obj, string_types)
+ return isinstance(obj, str)
def to_text_string(obj, encoding=None):
diff --git a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
index a34187efb4c..b19b7e3ec6c 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
@@ -20,9 +20,6 @@ from mantid.simpleapi import *
from mantid.kernel import *
from reduction_gui.reduction.reflectometer.refl_data_series import DataSeries
from reduction_gui.reduction.reflectometer.refl_data_script import DataSets
-from six import string_types
-
-
class LRAutoReduction(PythonAlgorithm):
def category(self):
@@ -443,7 +440,7 @@ class LRAutoReduction(PythonAlgorithm):
direct_beam_runs_str = self._read_property(meta_data_run, "direct_beam_runs",
_direct_beam_runs, is_string=True)
# The direct runs in the DAS logs are stored as a string
- if isinstance(direct_beam_runs_str, string_types):
+ if isinstance(direct_beam_runs_str, str):
try:
direct_beam_runs = [int(r.strip()) for r in direct_beam_runs_str.split(',')]
except ValueError:
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index 9cdf35d3f55..22fd7f36020 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -30,7 +30,7 @@ class UnitLabelTest(unittest.TestCase):
def test_str_function_produces_ascii_string_from_label(self):
label = UnitLabel("MyLabel", u"\u03bcs","\mu s")
- self.assertTrue(isinstance(str(label), six.string_types))
+ self.assertTrue(isinstance(str(label), str))
self.assertEqual("MyLabel", str(label))
def test_unicode_function_produces_unicode_string_from_label_py2(self):
diff --git a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index 76ed1acba01..00023b9f62a 100644
--- a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -8,9 +8,6 @@
import systemtesting
import os
from mantid.simpleapi import *
-from six import string_types
-
-
def _skip_test():
"""Helper function to determine if we run the test"""
import platform
@@ -48,7 +45,7 @@ class PG3Calibration(systemtesting.MantidSystemTest):
MaxOffset=0.01, PeakPositions = '.6866,.7283,.8185,.8920,1.0758,1.2615,2.0599',
CrossCorrelation = False, RunNumber = 'PG3_2538')
- if isinstance(output, string_types):
+ if isinstance(output, str):
self.saved_cal_file = output.replace('.h5','.cal')
else:
raise NotImplementedError("Output from CalibrateRectangularDetectors is NOT string for calibration file name!")
@@ -96,7 +93,7 @@ class PG3CCCalibration(systemtesting.MantidSystemTest):
MaxOffset=0.01, PeakPositions = '0.7282933,1.261441',DetectorsPeaks = '17,6',
CrossCorrelation = True, RunNumber = 'PG3_2538')
- if isinstance(output, string_types):
+ if isinstance(output, str):
self.saved_cal_file = output.replace('.h5','.cal')
else:
raise NotImplementedError("Output from CalibrateRectangularDetectors is NOT string for calibration file name!")
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
index 0700fca7bb5..8b89f9a7d9f 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
@@ -57,7 +57,7 @@ class ProjectRecoveryModel(QObject):
:return: List of 3 Strings; [0] Checkpoint name, [1] Number of workspaces, [2] Whether checkpoint has been tried
or not
"""
- if isinstance(checkpoint, six.string_types):
+ if isinstance(checkpoint, str):
# Assume if there is a T then it is a checkpoint and it needs to be replaced with a space
checkpoint = checkpoint.replace("T", " ")
for index in self.rows:
diff --git a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
index 71270b07c6a..ca03b3d8aed 100644
--- a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
+++ b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
@@ -36,7 +36,7 @@ def get_workspace_history_list(workspace):
def convert_list_to_string(to_convert, add_new_line=True, fix_comments=False):
string = ""
for line in to_convert:
- if isinstance(line, six.string_types):
+ if isinstance(line, str):
string += line
elif fix_comments and isinstance(line, tuple):
string += line[0]
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
index 64536b5ec4d..28ee90e5958 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
@@ -160,7 +160,7 @@ def open_in_window(widget_or_name, script, attach_debugger=True, pause=0,
app = get_application()
if widget_or_name is not None:
widget_name = 'Widget to test'
- if isinstance(widget_or_name, six.string_types):
+ if isinstance(widget_or_name, str):
widget = create_widget(widget_or_name)
widget_name = widget_or_name
elif isinstance(widget_or_name, QWidget):
@@ -199,7 +199,7 @@ def run_script(script_or_name, widget):
:param widget: A widget to interact with.
:return: Output of the script or an Exception object.
"""
- if isinstance(script_or_name, six.string_types):
+ if isinstance(script_or_name, str):
module_name, fun_name = split_qualified_name(script_or_name)
m = __import__(module_name, fromlist=[fun_name])
fun = getattr(m, fun_name)
diff --git a/qt/python/mantidqt/widgets/codeeditor/completion.py b/qt/python/mantidqt/widgets/codeeditor/completion.py
index ebeb55db118..83af21f3fac 100644
--- a/qt/python/mantidqt/widgets/codeeditor/completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/completion.py
@@ -36,7 +36,7 @@ import warnings
from lib2to3.pgen2.tokenize import detect_encoding
from io import BytesIO
-from six import PY2, string_types
+from six import PY2
if PY2: # noqa
from inspect import getargspec as getfullargspec
@@ -179,7 +179,7 @@ def generate_call_tips(definitions, prepend_module_name=None):
else:
module_name = prepend_module_name
if inspect.isfunction(py_object) or inspect.isbuiltin(py_object):
- if isinstance(module_name, string_types):
+ if isinstance(module_name, str):
call_tips.append(module_name + '.' + name + get_function_spec(py_object))
else:
call_tips.append(name + get_function_spec(py_object))
@@ -197,7 +197,7 @@ def generate_call_tips(definitions, prepend_module_name=None):
call_tip = name + '.' + attr + get_function_spec(f_attr)
else:
call_tip = name + '.' + attr
- if isinstance(module_name, string_types):
+ if isinstance(module_name, str):
call_tips.append(module_name + '.' + call_tip)
except Exception:
continue
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index 6a2578bda8d..cd94d7cd142 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -9,8 +9,6 @@ import math
import mantid.simpleapi as mantid
from mantid.api import WorkspaceGroup
-from six import string_types
-
from isis_powder.routines import absorb_corrections, common
from isis_powder.routines.common_enums import WORKSPACE_UNITS
from isis_powder.routines.run_details import create_run_details_object, get_cal_mapping_dict
@@ -166,7 +164,7 @@ def _obtain_focused_run(run_number, focus_file_path):
def _load_qlims(q_lims):
- if isinstance(q_lims, string_types):
+ if isinstance(q_lims, str):
q_min = []
q_max = []
try:
diff --git a/scripts/Inelastic/CrystalField/fitting.py b/scripts/Inelastic/CrystalField/fitting.py
index ec55d75e067..88380bc986a 100644
--- a/scripts/Inelastic/CrystalField/fitting.py
+++ b/scripts/Inelastic/CrystalField/fitting.py
@@ -7,9 +7,6 @@
import numpy as np
import re
import warnings
-from six import string_types
-
-
# RegEx pattern matching a composite function parameter name, eg f2.Sigma.
FN_PATTERN = re.compile('f(\\d+)\\.(.+)')
@@ -902,7 +899,7 @@ class CrystalField(object):
ws_index = args.pop(0)
pptype = 'M(T)' if (typeid == 4) else 'M(H)'
- self._typeid = self._str2id(typeid) if isinstance(typeid, string_types) else int(typeid)
+ self._typeid = self._str2id(typeid) if isinstance(typeid, str) else int(typeid)
return self._getPhysProp(PhysicalProperties(pptype, *args, **kwargs), workspace, ws_index)
@@ -1158,7 +1155,7 @@ class CrystalField(object):
alg = AlgorithmManager.createUnmanaged('EvaluateFunction')
alg.initialize()
alg.setChild(True)
- alg.setProperty('Function', i if isinstance(i, string_types) else self.makeSpectrumFunction(i))
+ alg.setProperty('Function', i if isinstance(i, str) else self.makeSpectrumFunction(i))
alg.setProperty("InputWorkspace", workspace)
alg.setProperty('WorkspaceIndex', ws_index)
alg.setProperty('OutputWorkspace', 'dummy')
diff --git a/scripts/Inelastic/CrystalField/function.py b/scripts/Inelastic/CrystalField/function.py
index 79833231af2..89ee2dd6aa5 100644
--- a/scripts/Inelastic/CrystalField/function.py
+++ b/scripts/Inelastic/CrystalField/function.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import re
-from six import string_types
-
parNamePattern = re.compile(r'([a-zA-Z][\w.]+)')
@@ -506,7 +504,7 @@ class PhysicalProperties(object):
self._physpropTemperature = 1.
self._lambda = 0. # Exchange parameter (for susceptibility only)
self._chi0 = 0. # Residual/background susceptibility (for susceptibility only)
- self._typeid = self._str2id(typeid) if isinstance(typeid, string_types) else int(typeid)
+ self._typeid = self._str2id(typeid) if isinstance(typeid, str) else int(typeid)
try:
initialiser = getattr(self, 'init' + str(self._typeid))
except AttributeError:
@@ -529,7 +527,7 @@ class PhysicalProperties(object):
def _checkhdir(self, hdir):
import numpy as np
try:
- if isinstance(hdir, string_types):
+ if isinstance(hdir, str):
if 'powder' in hdir.lower():
return 'powder'
else:
@@ -562,7 +560,7 @@ class PhysicalProperties(object):
@Inverse.setter
def Inverse(self, value):
if (self._typeid == self.SUSCEPTIBILITY or self._typeid == self.MAGNETICMOMENT):
- if isinstance(value, string_types):
+ if isinstance(value, str):
self._suscInverseFlag = value.lower() in ['true', 't', '1', 'yes', 'y']
else:
self._suscInverseFlag = bool(value) # In some cases will always be true...
diff --git a/scripts/Inelastic/CrystalField/normalisation.py b/scripts/Inelastic/CrystalField/normalisation.py
index d7d7ea42086..98b56a9b2ab 100644
--- a/scripts/Inelastic/CrystalField/normalisation.py
+++ b/scripts/Inelastic/CrystalField/normalisation.py
@@ -7,9 +7,6 @@
import numpy as np
from CrystalField.energies import energies as CFEnergy
from CrystalField.fitting import ionname2Nre
-from six import string_types
-
-
def _get_normalisation(nre, bnames):
""" Helper function to calculate the normalisation factor.
Defined as: ||Blm|| = sum_{Jz,Jz'} |<Jz|Blm|Jz'>|^2 / (2J+1)
@@ -175,7 +172,7 @@ def split2range(*args, **kwargs):
argin[argnames[ia]] = args[ia]
# Further arguments beyond the first 3 are treated as crystal field parameter names
for ia in range(3, len(args)):
- if isinstance(args[ia], string_types) and args[ia].startswith('B'):
+ if isinstance(args[ia], str) and args[ia].startswith('B'):
argin['Parameters'].append(args[ia])
# Parses the keyword arguments
for key, value in kwargs.items():
diff --git a/scripts/Inelastic/CrystalField/pointcharge.py b/scripts/Inelastic/CrystalField/pointcharge.py
index 8d824fdb5bc..b4c71474abb 100644
--- a/scripts/Inelastic/CrystalField/pointcharge.py
+++ b/scripts/Inelastic/CrystalField/pointcharge.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import numpy as np
-from six import string_types
from scipy import constants
import warnings
@@ -132,7 +131,7 @@ class PointCharge(object):
from mantid.simpleapi import mtd, LoadCIF, CreateWorkspace, DeleteWorkspace
import uuid
self._fromCIF = False
- if isinstance(structure, string_types):
+ if isinstance(structure, str):
if mtd.doesExist(structure):
try:
self._cryst = self._copyCrystalStructure(mtd[structure].sample().getCrystalStructure())
diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py
index 9cb8795a842..bcba21b4b55 100644
--- a/scripts/Inelastic/Direct/AbsorptionShapes.py
+++ b/scripts/Inelastic/Direct/AbsorptionShapes.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import string_types
+
from mantid.kernel import funcinspect
from mantid.simpleapi import *
@@ -106,7 +106,7 @@ class anAbsorptionShape(object):
if value is None:
self._Material = {}
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = [value]
if isinstance(value,(list,tuple)):
if len(value) == 2:
@@ -129,7 +129,7 @@ class anAbsorptionShape(object):
#
Mater_properties = self._Material
if 'ChemicalFormula' in Mater_properties:
- if not isinstance(Mater_properties['ChemicalFormula'], string_types):
+ if not isinstance(Mater_properties['ChemicalFormula'], str):
raise TypeError('*** The chemical formula for the material must be described by a string')
# Test if the material property are recognized by SetSampleMaterial
# algorithm.
@@ -246,7 +246,7 @@ class anAbsorptionShape(object):
{'Cylinder': Cylinder(), 'FlatPlate':FlatPlate(),
'HollowCylinder':HollowCylinder(),'Sphere': Sphere()} # noqa: E127
- if not isinstance(str_val, string_types):
+ if not isinstance(str_val, str):
raise ValueError(
'The input of the "from_str" function should be a string representing a diary.'
' Actually it is: {0}'.format(type(str_val)))
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 43966da527a..4de8c4fccae 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -17,7 +17,6 @@ import math
import time
import numpy as np
import collections
-from six import string_types
from six.moves import range
import Direct.CommonFunctions as common
@@ -1343,7 +1342,7 @@ class DirectEnergyConversion(object):
self._spectra_masks=None
elif isinstance(value,api.Workspace):
self._spectra_masks = value.name()
- elif isinstance(value, string_types):
+ elif isinstance(value, str):
if value in mtd:
self._spectra_masks = value
else:
diff --git a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
index e1c154d26b8..55c02cf2e7b 100644
--- a/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
+++ b/scripts/Inelastic/Direct/ISISDirecInelasticConfig.py
@@ -14,8 +14,6 @@ import copy
from datetime import date
import time
from xml.dom import minidom
-from six import string_types
-
# the list of instruments this configuration is applicable to
INELASTIC_INSTRUMENTS = ['MAPS', 'LET', 'MERLIN', 'MARI', 'HET']
# the list of the parameters, which can be replaced if found in user files
@@ -264,7 +262,7 @@ class UserProperties(object):
if isinstance(cycle, int):
cycle = convert_cycle_int(cycle)
- if isinstance(cycle, string_types):
+ if isinstance(cycle, str):
if len(cycle) == 11:
last_letter = cycle[-1]
if not last_letter.upper() in {'A','B','C','D','E'}:
@@ -288,7 +286,7 @@ class UserProperties(object):
"but it is {0}".format(cycle))
if isinstance(rb_folder_or_id, int):
rb_folder_or_id = "RB{0:07}".format(rb_folder_or_id)
- if not isinstance(rb_folder_or_id, string_types):
+ if not isinstance(rb_folder_or_id, str):
raise RuntimeError("RB Folder {0} should be a string".format(rb_folder_or_id))
else:
f_path, rbf = os.path.split(rb_folder_or_id)
@@ -316,7 +314,7 @@ class UserProperties(object):
"ISIS inelastic instruments".format(instrument))
def validate_date(self, start_date):
- if isinstance(start_date, string_types):
+ if isinstance(start_date, str):
# the date of express -- let's make it long in the past
if start_date.lower() == 'none':
start_date = '19800101'
diff --git a/scripts/Inelastic/Direct/NonIDF_Properties.py b/scripts/Inelastic/Direct/NonIDF_Properties.py
index c84bd78d2d6..967916b032d 100644
--- a/scripts/Inelastic/Direct/NonIDF_Properties.py
+++ b/scripts/Inelastic/Direct/NonIDF_Properties.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from six import string_types
from Direct.PropertiesDescriptors import *
from Direct.RunDescriptor import RunDescriptor,RunDescriptorDependent
from mantid.simpleapi import *
@@ -202,7 +201,7 @@ class NonIDF_Properties(object):
facility_ = config.getFacility('TEST_LIVE')
#end
- elif isinstance(Instrument, string_types): # instrument name defined
+ elif isinstance(Instrument, str): # instrument name defined
new_name,full_name,facility_ = prop_helpers.check_instrument_name(None,Instrument)
#idf_dir = config.getString('instrumentDefinitgeton.directory')
idf_file = api.ExperimentInfo.getInstrumentFilename(full_name)
diff --git a/scripts/Inelastic/Direct/PropertiesDescriptors.py b/scripts/Inelastic/Direct/PropertiesDescriptors.py
index 91bb40d0ecc..b676d400ae7 100644
--- a/scripts/Inelastic/Direct/PropertiesDescriptors.py
+++ b/scripts/Inelastic/Direct/PropertiesDescriptors.py
@@ -14,8 +14,6 @@ import numpy as np
import math
import re
from collections import Iterable
-from six import string_types
-
import mantid.simpleapi as mantid
from mantid import api
@@ -189,7 +187,7 @@ class IncidentEnergy(PropDescriptor):
""" Set up incident energy or range of energies in various formats
or define autoEi"""
if value is not None:
- if isinstance(value, string_types):
+ if isinstance(value, str):
# Check autoEi
if value.lower() == 'auto':
self._use_autoEi = True
@@ -404,7 +402,7 @@ class EnergyBins(PropDescriptor):
def __set__(self, instance, values):
if values is not None:
- if isinstance(values, string_types):
+ if isinstance(values, str):
values = values.replace('[', '').replace(']', '').strip()
lst = values.split(',')
self.__set__(instance, lst)
@@ -621,7 +619,7 @@ class mon2NormalizationEnergyRange(PropDescriptor):
""" set detector calibration file using various formats """
if isinstance(val, list):
self._relative_range = self._check_range(val, instance)
- elif isinstance(val, string_types):
+ elif isinstance(val, str):
val = self._parce_string2list(val)
self.__set__(instance, val)
else:
@@ -743,7 +741,7 @@ class DetCalFile(PropDescriptor):
self._det_cal_file = val
self._calibrated_by_run = False
return
- if isinstance(val, string_types):
+ if isinstance(val, str):
if val in mantid.mtd:
val = mantid.mtd[val]
self._det_cal_file = val
@@ -797,7 +795,7 @@ class DetCalFile(PropDescriptor):
return (True, 'Workspace {0} used for detectors calibration'.format(self._det_cal_file.name()))
dcf_val = self._det_cal_file
- if isinstance(dcf_val, string_types): # it may be string representation of runN
+ if isinstance(dcf_val, str): # it may be string representation of runN
try:
dcf_val = int(dcf_val)
except ValueError:
@@ -938,7 +936,7 @@ class HardMaskOnly(prop_helpers.ComplexProperty):
if isinstance(value, bool) or isinstance(value, int):
use_hard_mask_only = bool(value)
hard_mask_file = instance.hard_mask_file
- elif isinstance(value, string_types):
+ elif isinstance(value, str):
if value.lower() in ['true', 'yes']:
use_hard_mask_only = True
elif value.lower() in ['false', 'no']:
@@ -1035,7 +1033,7 @@ class MonovanIntegrationRange(prop_helpers.ComplexProperty):
self._rel_range = False
self._other_prop = ['monovan_lo_value', 'monovan_hi_value']
- if isinstance(value, string_types):
+ if isinstance(value, str):
values = value.split(',')
result = []
for val in values:
@@ -1103,7 +1101,7 @@ class EiMonSpectra(prop_helpers.ComplexProperty):
else:
tDict = instance.__dict__
- if isinstance(value, string_types):
+ if isinstance(value, str):
val = value.replace('[', '').replace(']', '').strip()
if val.find(':') > -1:
val = val.split(':')
@@ -1149,7 +1147,7 @@ class EiMonSpectra(prop_helpers.ComplexProperty):
properties and these properties are currently standard properties
"""
- if isinstance(mon_range, string_types):
+ if isinstance(mon_range, str):
mon_val = mon_range.split(',')
else:
mon_val = mon_range
@@ -1199,7 +1197,7 @@ class SpectraToMonitorsList(PropDescriptor):
if spectra_list is None:
return None
- if isinstance(spectra_list, string_types):
+ if isinstance(spectra_list, str):
if spectra_list.lower() == 'none':
result = None
else:
@@ -1254,7 +1252,7 @@ class SaveFormat(PropDescriptor):
return
# check string
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.strip('[]().')
subformats = value.split(',')
if len(subformats) > 1:
@@ -1318,7 +1316,7 @@ class DiagSpectra(PropDescriptor):
""" process IDF description of the spectra string """
if specta_sring is None:
return None
- if isinstance(specta_sring, string_types):
+ if isinstance(specta_sring, str):
if specta_sring.lower() in ['none', 'no']:
return None
else:
@@ -1363,7 +1361,7 @@ class BackbgroundTestRange(PropDescriptor):
if value is None:
self._background_test_range = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.split(',')
if len(value) != 2:
raise ValueError("background test range can be only a 2 element list of floats")
@@ -1408,7 +1406,7 @@ class MultirepTOFSpectraList(PropDescriptor):
if value is None:
self._spectra_list = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
value = value.split(',')
self.__set__(instance, value)
return
@@ -1521,7 +1519,7 @@ class MotorLogName(PropDescriptor):
return self._log_names
def __set__(self, instance, value):
- if isinstance(value, string_types):
+ if isinstance(value, str):
val_list = value.split(';')
elif isinstance(value, list):
val_list = []
@@ -1589,7 +1587,7 @@ class RotationAngle(PropDescriptor):
return self.read_psi_from_workspace(self._log_ws_name)
def __set__(self, instance, value):
- if isinstance(value, string_types):
+ if isinstance(value, str):
if value in mantid.mtd: ## its workspace
self._log_ws_name = value
self._own_psi_value = None
@@ -1614,7 +1612,7 @@ class RotationAngle(PropDescriptor):
if working_ws is None:
raise RuntimeError("No workspace provided. Can not read logs to identify psi")
else:
- if isinstance(external_ws, string_types):
+ if isinstance(external_ws, str):
working_ws = mantid.mtd[external_ws]
value = None
@@ -1706,7 +1704,7 @@ class AbsCorrInfo(PropDescriptor):
self._is_fast = False
return
val_dict = {}
- if isinstance(value, string_types):
+ if isinstance(value, str):
val = re.sub(' u ', ' ', re.sub(r'[{}\[\]"=:;,\']', ' ', value))
val_list = re.split(r'\s+',val)
ik = 0
@@ -1787,7 +1785,7 @@ class AbsorptionShapesContainer(PropDescriptor):
if value is None:
self._theShapeHolder = None
return
- if isinstance(value, string_types):
+ if isinstance(value, str):
self._theShapeHolder = anAbsorptionShape.from_str(value)
elif isinstance(value,anAbsorptionShape):
self._theShapeHolder = value
diff --git a/scripts/Inelastic/Direct/PropertyManager.py b/scripts/Inelastic/Direct/PropertyManager.py
index 501eb5bc4bd..7a34d05abc5 100644
--- a/scripts/Inelastic/Direct/PropertyManager.py
+++ b/scripts/Inelastic/Direct/PropertyManager.py
@@ -11,7 +11,6 @@
from Direct.NonIDF_Properties import *
from collections import OrderedDict, Iterable
-from six import string_types
from mantid.kernel import funcinspect
@@ -164,7 +163,7 @@ class PropertyManager(NonIDF_Properties):
#end
# replace common substitutions for string value
- if isinstance(val, string_types):
+ if isinstance(val, str):
val1 = val.lower()
if val1 == 'none' or len(val1) == 0:
val = None
diff --git a/scripts/Inelastic/Direct/ReductionHelpers.py b/scripts/Inelastic/Direct/ReductionHelpers.py
index 14f346b26b5..a4dd4c7ac25 100644
--- a/scripts/Inelastic/Direct/ReductionHelpers.py
+++ b/scripts/Inelastic/Direct/ReductionHelpers.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from six import string_types
from mantid import config
import os
import re
@@ -166,7 +165,7 @@ def build_properties_dict(param_map,synonims,descr_list=[]) :
if final_name in descr_list:
is_descriptor = True
- if isinstance(val, string_types):
+ if isinstance(val, str):
val = val.strip()
keys_candidates = val.split(":")
n_keys = len(keys_candidates)
@@ -226,7 +225,7 @@ def build_subst_dictionary(synonims_list=None) :
return dict()
if isinstance(synonims_list, dict) : # all done
return synonims_list
- if not isinstance(synonims_list, string_types):
+ if not isinstance(synonims_list, str):
raise AttributeError("The synonyms field of Reducer object has to be special format string or the dictionary")
# we are in the right place and going to transform string into
# dictionary
@@ -377,7 +376,7 @@ def parse_single_name(filename):
def parse_run_file_name(run_string):
""" Parses run file name to obtain run number, path if possible, and file extension if any present in the string"""
- if not isinstance(run_string, string_types):
+ if not isinstance(run_string, str):
raise ValueError("REDUCTION_HELPER:parse_run_file_name -- input has to be a string")
runs = run_string.split(',')
diff --git a/scripts/Inelastic/Direct/ReductionWrapper.py b/scripts/Inelastic/Direct/ReductionWrapper.py
index 84146b1bee0..9bd1a70fe25 100644
--- a/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -16,8 +16,6 @@ from types import MethodType # noqa
import os
import re
import time
-from six import string_types
-
try:
import h5py
@@ -134,8 +132,8 @@ class ReductionWrapper(object):
f.write("standard_vars = {\n")
str_wrapper = ' '
for key, val in self._wvs.standard_vars.items():
- if isinstance(val, string_types):
- row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
+ if isinstance(val, str):
+ row = "{0}\'{1}\':\'{2}\'".format(str_wrapper,key,val)
else:
row = "{0}\'{1}\':{2}".format(str_wrapper, key, val)
f.write(row)
@@ -144,8 +142,8 @@ class ReductionWrapper(object):
# print advances variables
str_wrapper = ' '
for key, val in self._wvs.advanced_vars.items():
- if isinstance(val, string_types):
- row = "{0}\'{1}\':\'{2}\'".format(str_wrapper, key, val)
+ if isinstance(val, str):
+ row = "{0}\'{1}\':\'{2}\'".format(str_wrapper,key,val)
else:
row = "{0}\'{1}\':{2}".format(str_wrapper, key, val)
f.write(row)
@@ -320,7 +318,7 @@ class ReductionWrapper(object):
# this row defines location of the validation file
validation_file = self.validation_file_name()
sample_run = self.validate_run_number
- if isinstance(validation_file, string_types):
+ if isinstance(validation_file, str):
path, name = os.path.split(validation_file)
if name in mtd:
reference_ws = mtd[name]
@@ -758,7 +756,7 @@ def iliad(reduce):
input_file = None
output_directory = None
# add input file folder to data search directory if file has it
- if input_file and isinstance(input_file, string_types):
+ if input_file and isinstance(input_file, str):
data_path = os.path.dirname(input_file)
if len(data_path) > 0:
try:
@@ -786,7 +784,7 @@ def iliad(reduce):
# prohibit returning workspace to web services.
# pylint: disable=protected-access
- if host._run_from_web and not isinstance(rez, string_types):
+ if host._run_from_web and not isinstance(rez, str):
rez = ""
else:
if isinstance(rez, list):
diff --git a/scripts/Inelastic/Direct/RunDescriptor.py b/scripts/Inelastic/Direct/RunDescriptor.py
index 67bf822de8f..7fbd7339ac6 100644
--- a/scripts/Inelastic/Direct/RunDescriptor.py
+++ b/scripts/Inelastic/Direct/RunDescriptor.py
@@ -9,7 +9,6 @@
#pylint: disable=attribute-defined-outside-init
""" File contains Descriptors used describe run for direct inelastic reduction """
-from six import string_types
from mantid.simpleapi import *
from mantid.kernel import funcinspect
from Direct.PropertiesDescriptors import *
@@ -53,7 +52,7 @@ class RunList(object):
local_fext=[]
for item in runs_to_add:
- if isinstance(item, string_types):
+ if isinstance(item, str):
file_path,run_num,fext = prop_helpers.parse_run_file_name(item)
runs.append(run_num)
if not fnames_given:
@@ -451,7 +450,7 @@ class RunDescriptor(PropDescriptor):
self._set_ws_as_source(value)
return
- if isinstance(value, string_types): # it may be run number as string or it may be a workspace name
+ if isinstance(value, str): # it may be run number as string or it may be a workspace name
if value in mtd: # workspace name
ws = mtd[value]
self.__set__(instance,ws)
@@ -992,7 +991,7 @@ class RunDescriptor(PropDescriptor):
def set_file_ext(self,val):
"""Set non-default file extension """
- if isinstance(val, string_types):
+ if isinstance(val, str):
if val[0] != '.':
value = '.' + val
else:
@@ -1151,7 +1150,7 @@ class RunDescriptor(PropDescriptor):
ws_calibration = prop_helpers.get_default_parameter(loaded_ws.getInstrument(),'det_cal_file')
if ws_calibration is None:
ws_calibration = calibration
- if isinstance(ws_calibration, string_types) and ws_calibration.lower() == 'none':
+ if isinstance(ws_calibration, str) and ws_calibration.lower() == 'none':
ws_calibration = calibration
if ws_calibration :
test_name = ws_calibration
@@ -1167,7 +1166,7 @@ class RunDescriptor(PropDescriptor):
else:
return
- if isinstance(ws_calibration, string_types) : # It can be only a file (got it from calibration property)
+ if isinstance(ws_calibration, str) : # It can be only a file (got it from calibration property)
RunDescriptor._logger('load_data: Moving detectors to positions specified in cal file {0}'.format(ws_calibration),'debug')
# Pull in pressures, thicknesses & update from cal file
LoadDetectorInfo(Workspace=loaded_ws, DataFilename=ws_calibration, RelocateDets=True)
@@ -1669,7 +1668,7 @@ def build_run_file_name(run_num,inst,file_path='',fext=''):
"""Build the full name of a runfile from all possible components"""
if fext is None:
fext = ''
- if isinstance(run_num, string_types):
+ if isinstance(run_num, str):
run_num_str = run_num
else:
#pylint: disable=protected-access
diff --git a/scripts/Inelastic/Direct/diagnostics.py b/scripts/Inelastic/Direct/diagnostics.py
index e6db56ecd6f..82eb87987d1 100644
--- a/scripts/Inelastic/Direct/diagnostics.py
+++ b/scripts/Inelastic/Direct/diagnostics.py
@@ -17,7 +17,6 @@ The output of each function is a workspace containing a single bin where:
This workspace can be summed with other masked workspaces to accumulate
masking and also passed to MaskDetectors to match masking there.
"""
-from six import string_types
from mantid.simpleapi import *
from mantid.kernel.funcinspect import lhs_info
import os
@@ -455,7 +454,7 @@ def get_failed_spectra_list(diag_workspace):
diag_workspace - A workspace containing masking
"""
- if isinstance(diag_workspace, string_types):
+ if isinstance(diag_workspace, str):
diag_workspace = mtd[diag_workspace]
failed_spectra = []
diff --git a/scripts/Muon/GUI/Common/contexts/fitting_context.py b/scripts/Muon/GUI/Common/contexts/fitting_context.py
index a94140ae5b6..d04bab15879 100644
--- a/scripts/Muon/GUI/Common/contexts/fitting_context.py
+++ b/scripts/Muon/GUI/Common/contexts/fitting_context.py
@@ -8,7 +8,6 @@ from collections import OrderedDict
import re
from mantid.api import AnalysisDataService
-from mantid.py3compat import string_types
import numpy as np
from mantidqt.utils.observer_pattern import Observable
@@ -198,9 +197,9 @@ class FitInformation(object):
global_parameters)
self.fit_function_name = fit_function_name
self.input_workspaces = [input_workspace] if isinstance(
- input_workspace, string_types) else input_workspace
+ input_workspace, str) else input_workspace
self.output_workspace_names = [output_workspace_names] if isinstance(
- output_workspace_names, string_types) else output_workspace_names
+ output_workspace_names, str) else output_workspace_names
def __eq__(self, other):
"""Objects are equal if each member is equal to the other"""
diff --git a/scripts/Muon/GUI/Common/muon_group.py b/scripts/Muon/GUI/Common/muon_group.py
index ad4badba2fd..a7fc79330b0 100644
--- a/scripts/Muon/GUI/Common/muon_group.py
+++ b/scripts/Muon/GUI/Common/muon_group.py
@@ -63,7 +63,7 @@ class MuonGroup(object):
@detectors.setter
def detectors(self, detector_ids):
- if isinstance(detector_ids, six.string_types):
+ if isinstance(detector_ids, str):
raise AttributeError("MuonGroup : detectors must be a list of ints.")
elif isinstance(detector_ids, list):
if sum([not isinstance(item, int) for item in detector_ids]) == 0:
diff --git a/scripts/PyChop/Instruments.py b/scripts/PyChop/Instruments.py
index 29ebfc0472a..507c4b1df5a 100644
--- a/scripts/PyChop/Instruments.py
+++ b/scripts/PyChop/Instruments.py
@@ -9,7 +9,6 @@ This module is a wrapper around a set of instrument parameters (to be read from
and methods which then call either Chop.py or MulpyRep.py to do the resolution calculations.
"""
-from six import string_types
import numpy as np
import yaml
import warnings
@@ -669,7 +668,7 @@ class Instrument(object):
__known_instruments = ['let', 'maps', 'mari', 'merlin']
def __init__(self, instrument, chopper=None, freq=None):
- if isinstance(instrument, string_types):
+ if isinstance(instrument, str):
# check if it is a file or instrument name we want
if instrument.lower() in self.__known_instruments:
import os.path
diff --git a/scripts/PyChop/MulpyRep.py b/scripts/PyChop/MulpyRep.py
index 3aad68d272c..89173d9124e 100644
--- a/scripts/PyChop/MulpyRep.py
+++ b/scripts/PyChop/MulpyRep.py
@@ -12,7 +12,6 @@ Contains a class to calculate the possible reps, resolution and flux for a direc
spectrometer. Python implementation by D J Voneshen based on the original Matlab program of R I Bewley.
"""
-from six import string_types
import numpy as np
import copy
@@ -223,8 +222,8 @@ def calcChopTimes(efocus, freq, instrumentpars, chop2Phase=5):
for i in range(len(dist)):
# loop over each chopper
# checks whether this chopper should have an independently set phase / delay
- islt = int(phase[i]) if (ph_ind[i] and isinstance(phase[i], string_types)) else 0
- if ph_ind[i] and not isinstance(phase[i], string_types):
+ islt = int(phase[i]) if (ph_ind[i] and isinstance(phase[i], str)) else 0
+ if ph_ind[i] and not isinstance(phase[i], str):
# effective chopper velocity (if 2 disks effective velocity is double)
chopVel = 2*np.pi*radius[i] * numDisk[i] * freq[i]
# full opening time
diff --git a/scripts/PyChop/PyChopGui.py b/scripts/PyChop/PyChopGui.py
index f170cfd3c29..2183304b3f5 100755
--- a/scripts/PyChop/PyChopGui.py
+++ b/scripts/PyChop/PyChopGui.py
@@ -14,7 +14,6 @@
This module contains a class to create a graphical user interface for PyChop.
"""
-from six import string_types
import sys
import re
import numpy as np
@@ -161,7 +160,7 @@ class PyChopGui(QMainWindow):
freq_in = [freq_in, freqpr]
if not self.widgets['Chopper2Phase']['Label'].isHidden():
chop2phase = self.widgets['Chopper2Phase']['Edit'].text()
- if isinstance(self.engine.chopper_system.defaultPhase[0], string_types):
+ if isinstance(self.engine.chopper_system.defaultPhase[0], str):
chop2phase = str(chop2phase)
else:
chop2phase = float(chop2phase) % (1e6 / self.engine.moderator.source_rep)
diff --git a/scripts/SANS/sans/common/log_tagger.py b/scripts/SANS/sans/common/log_tagger.py
index 365e48ed0e5..cf7f842e70b 100644
--- a/scripts/SANS/sans/common/log_tagger.py
+++ b/scripts/SANS/sans/common/log_tagger.py
@@ -10,9 +10,6 @@
from hashlib import sha224
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
-from six import string_types
-
-
def get_hash_value(value):
"""
Converts a value into a hash
@@ -33,7 +30,7 @@ def check_if_valid_tag_and_workspace(tag, workspace):
:param tag: the tag
:param workspace: the workspace
"""
- if not(isinstance(tag, string_types) and isinstance(workspace, MatrixWorkspace)):
+ if not(isinstance(tag, str) and isinstance(workspace, MatrixWorkspace)):
raise RuntimeError("SANSLogTagger: Either tag {0} or workspace are invalid. The tag has to be a string"
" and the workspace {1} has to be a MatrixWorkspace".format(str(tag), str(workspace)))
diff --git a/scripts/SANS/sans/state/Serializer.py b/scripts/SANS/sans/state/Serializer.py
index 64c16857476..d6121ed5d83 100644
--- a/scripts/SANS/sans/state/Serializer.py
+++ b/scripts/SANS/sans/state/Serializer.py
@@ -53,7 +53,7 @@ class SerializerImpl(json.JSONEncoder):
@staticmethod
def obj_hook(o):
for type_tag, internal_dict in o.items():
- assert isinstance(type_tag, six.string_types)
+ assert isinstance(type_tag, str)
cls_type = JsonSerializable.class_type_from_tag(type_tag)
if cls_type:
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
index 072a421fc8a..e28a1ceaeaa 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
@@ -12,7 +12,7 @@ import unittest
from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import mock, string_types
+from mantid.py3compat import mock
from mantid.simpleapi import Load
from mantidqt.utils.qt.testing import start_qapplication
@@ -380,7 +380,7 @@ class ResultsTabModelTest(unittest.TestCase):
self.assertEqual(len(expected_row), len(actual_row))
for col_index, expected in enumerate(expected_row):
actual = table.cell(row_index, col_index)
- if isinstance(expected, string_types):
+ if isinstance(expected, str):
self.assertEqual(expected, actual)
else:
# Fit pushes things back/forth through strings so exact match is not possible
--
GitLab
From 656778b9f978b1b7e4d6c07bf31a88624e845306 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:37:28 +0000
Subject: [PATCH 09/37] RE #27722 Remove PY2 imports from six
---
.../mantid/py3compat/__init__.py | 31 ++++++-------------
Framework/PythonInterface/mantid/simpleapi.py | 5 +--
Framework/PythonInterface/mantid/utils.py | 5 +--
.../test/python/mantid/api/AlgorithmTest.py | 7 +----
.../tests/analysis/EnggCalibrationTest.py | 3 --
.../tests/analysis/ValidateInstrumentDir.py | 2 --
.../mantidqt/widgets/codeeditor/completion.py | 6 +---
.../widgets/codeeditor/errorformatter.py | 5 ---
.../codeeditor/test/test_errorformatter.py | 18 -----------
scripts/AbinsModules/GeneralAbInitioParser.py | 18 +++++------
scripts/AbinsModules/IOmodule.py | 28 ++---------------
scripts/AbinsModules/LoadCRYSTAL.py | 5 ++-
scripts/AbinsModules/LoadDMOL3.py | 5 ++-
scripts/AbinsModules/LoadGAUSSIAN.py | 5 ++-
.../isis_powder/routines/common.py | 10 +-----
.../test/ISISPowderSampleDetailsTest.py | 5 +--
scripts/Engineering/EnginX.py | 15 +++------
.../command_interface/ISISCommandInterface.py | 4 ---
scripts/test/Abins/AbinsIOmoduleTest.py | 26 ----------------
.../batch_csv_file_parser_test.py | 4 +--
.../isis_command_interface_test.py | 3 --
21 files changed, 37 insertions(+), 173 deletions(-)
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index 5df53aa7416..cc7bbda114b 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -41,12 +41,12 @@ __all__ = dir(six)
# -----------------------------------------------------------------------------
# Library functions
# -----------------------------------------------------------------------------
-if six.PY2 or sys.version_info[0:2] < (3, 2):
+if sys.version_info[0:2] < (3, 2):
setswitchinterval = sys.setcheckinterval
else:
setswitchinterval = sys.setswitchinterval
-if six.PY2 or sys.version_info[0:2] < (3, 5):
+if sys.version_info[0:2] < (3, 5):
# getfullargspec deprecated up until python 3.5, so use getargspec
getfullargspec = inspect.getargspec
else:
@@ -56,10 +56,7 @@ else:
# -----------------------------------------------------------------------------
# File manipulation
# -----------------------------------------------------------------------------
-if six.PY2:
- csv_open_type = 'wb'
-else:
- csv_open_type = 'w'
+csv_open_type = 'w'
# -----------------------------------------------------------------------------
@@ -80,7 +77,7 @@ if not hasattr(six, "ensure_str"):
"""
if not isinstance(s, (text_type, binary_type)):
raise TypeError("not expecting type '%s'" % type(s))
- if PY2 and isinstance(s, text_type):
+ if isinstance(s, text_type):
s = s.encode(encoding, errors)
elif PY3 and isinstance(s, binary_type):
s = s.decode(encoding, errors)
@@ -96,21 +93,13 @@ def is_text_string(obj):
def to_text_string(obj, encoding=None):
"""Convert `obj` to (unicode) text string"""
- if PY2:
- # Python 2
- if encoding is None:
- return unicode(obj)
- else:
- return unicode(obj, encoding)
+ if encoding is None:
+ return str(obj)
+ elif isinstance(obj, str):
+ # In case this function is not used properly, this could happen
+ return obj
else:
- # Python 3
- if encoding is None:
- return str(obj)
- elif isinstance(obj, str):
- # In case this function is not used properly, this could happen
- return obj
- else:
- return str(obj, encoding)
+ return str(obj, encoding)
def qbytearray_to_str(qba):
diff --git a/Framework/PythonInterface/mantid/simpleapi.py b/Framework/PythonInterface/mantid/simpleapi.py
index e3e66490a3f..4a5d1486863 100644
--- a/Framework/PythonInterface/mantid/simpleapi.py
+++ b/Framework/PythonInterface/mantid/simpleapi.py
@@ -743,10 +743,7 @@ def _get_function_spec(func):
"""
import inspect
try:
- if six.PY2:
- argspec = inspect.getargspec(func)
- else:
- argspec = inspect.getfullargspec(func)
+ argspec = inspect.getfullargspec(func)
except TypeError:
return ''
# Algorithm functions have varargs set not args
diff --git a/Framework/PythonInterface/mantid/utils.py b/Framework/PythonInterface/mantid/utils.py
index 18394d05873..674e4dc6815 100644
--- a/Framework/PythonInterface/mantid/utils.py
+++ b/Framework/PythonInterface/mantid/utils.py
@@ -71,10 +71,7 @@ def _shared_cextension():
return
import six
- if six.PY2:
- import DLFCN as dl
- else:
- import os as dl
+ import os as dl
flags_orig = sys.getdlopenflags()
sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL)
yield
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
index e0239da7203..bed4151f814 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
@@ -66,12 +66,7 @@ class AlgorithmTest(unittest.TestCase):
data = [1.5,2.5,3.5]
kwargs = {'child':True}
unitx = 'Wavelength'
- if six.PY2:
- # force a property value to be unicode to assert conversion happens correctly
- # this is only an issue in python2
- kwargs[unicode('UnitX')] = unicode(unitx)
- else:
- kwargs['UnitX'] = unitx
+ kwargs['UnitX'] = unitx
alg = run_algorithm('CreateWorkspace',DataX=data,DataY=data,NSpec=1,**kwargs)
diff --git a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
index 48a3bf557c0..7a82a7c9b65 100644
--- a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
+++ b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
@@ -7,7 +7,6 @@
# pylint: disable=no-init
import systemtesting
from mantid.simpleapi import *
-from six import PY2
def rel_err_less_delta(val, ref, epsilon):
@@ -239,8 +238,6 @@ class EnginXCalibrateFullThenCalibrateTest(systemtesting.MantidSystemTest):
for idx in [0, 12, 516, 789, 891, 1112]:
cell_val = self.peaks_info.cell(idx, 1)
self.assertTrue(isinstance(cell_val, str))
- if PY2: # This test depends on consistent ordering of a dict which is not guaranteed for python 3
- self.assertEqual(cell_val[0:11], '{"1": {"A":')
self.assertEqual(cell_val[-2:], '}}')
# this will be used as a comparison delta in relative terms (percentage)
diff --git a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
index e517ea596a6..f95d0e4422e 100644
--- a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
+++ b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
@@ -13,8 +13,6 @@ from mantid import config
import six
import systemtesting
-if six.PY2:
- from io import open # noqa
# Constants
FILE_TO_TEST = None # "MARI_Definition.xml"
diff --git a/qt/python/mantidqt/widgets/codeeditor/completion.py b/qt/python/mantidqt/widgets/codeeditor/completion.py
index 83af21f3fac..d91b96ceb57 100644
--- a/qt/python/mantidqt/widgets/codeeditor/completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/completion.py
@@ -36,12 +36,8 @@ import warnings
from lib2to3.pgen2.tokenize import detect_encoding
from io import BytesIO
-from six import PY2
-if PY2: # noqa
- from inspect import getargspec as getfullargspec
-else: # noqa
- from inspect import getfullargspec
+from inspect import getfullargspec
from mantidqt.widgets.codeeditor.editor import CodeEditor
diff --git a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
index 7d9919625ab..ff3e6ef2702 100644
--- a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
@@ -32,9 +32,4 @@ class ErrorFormatter(object):
if stack is not None:
lines.extend(traceback.format_list(stack))
- if six.PY2:
- # traceback always returns a list of ascii string objects
- # encoded as utf-8 we want unicode to be consistent
- # with using unicode_literals across the codebase
- lines = map(lambda x: x.decode('utf-8') , lines)
return ''.join(lines)
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
index 31f3dbe6ee4..b3669683895 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
@@ -69,24 +69,6 @@ foo()
for produced, expected in zip(error_lines, expected_lines):
self.assertRegexpMatches(produced, expected)
- def test_errors_containing_unicode_produce_expected_value_in_python2(self):
- if not six.PY2:
- # everything is already unicode in python > 2
- return
- try:
- exec("é =")
- except SyntaxError:
- exc_type, exc_value = sys.exc_info()[:2]
- formatter = ErrorFormatter()
- error = formatter.format(exc_type, exc_value, None)
-
- expected = """ File "<string>", line 1
- é =
- ^
-SyntaxError: invalid syntax
-"""
- self.assertEqual(expected, error)
-
if __name__ == "__main__":
unittest.main()
diff --git a/scripts/AbinsModules/GeneralAbInitioParser.py b/scripts/AbinsModules/GeneralAbInitioParser.py
index efbc50311a8..8fac68301b8 100644
--- a/scripts/AbinsModules/GeneralAbInitioParser.py
+++ b/scripts/AbinsModules/GeneralAbInitioParser.py
@@ -27,11 +27,10 @@ class GeneralAbInitioParser(object):
This string will be compiled to a Python re.Pattern .
:type regex: str
"""
- if not six.PY2:
- if msg is not None:
- msg = bytes(msg, "utf8")
- if regex is not None:
- regex = bytes(regex, "utf8")
+ if msg is not None:
+ msg = bytes(msg, "utf8")
+ if regex is not None:
+ regex = bytes(regex, "utf8")
if msg and regex:
raise ValueError("msg or regex should be provided, not both")
@@ -57,8 +56,7 @@ class GeneralAbInitioParser(object):
:param file_obj: file object from which we read
:param msg: keyword to find
"""
- if not six.PY2:
- msg = bytes(msg, "utf8")
+ msg = bytes(msg, "utf8")
found = False
last_entry = None
@@ -101,8 +99,7 @@ class GeneralAbInitioParser(object):
pos = file_obj.tell()
line = file_obj.readline()
file_obj.seek(pos)
- if not six.PY2:
- item = bytes(item, "utf8")
+ item = bytes(item, "utf8")
if item in line:
return True
return False
@@ -113,8 +110,7 @@ class GeneralAbInitioParser(object):
:param file_obj: file object from which we read
:param msg: keyword to find
"""
- if not six.PY2:
- msg = bytes(msg, "utf8")
+ msg = bytes(msg, "utf8")
while not self.file_end(file_obj=file_obj):
pos = file_obj.tell()
line = file_obj.readline()
diff --git a/scripts/AbinsModules/IOmodule.py b/scripts/AbinsModules/IOmodule.py
index 0c4e5895b97..18f4fefbec8 100644
--- a/scripts/AbinsModules/IOmodule.py
+++ b/scripts/AbinsModules/IOmodule.py
@@ -300,28 +300,6 @@ class IOmodule(object):
end = reversed_path.find("/")
return reversed_path[:end]
- @classmethod
- def _convert_unicode_to_str(cls, object_to_check):
- """
- Converts unicode to Python str, works for nested dicts and lists (recursive algorithm). Only required
- for Python 2 where a mismatch with unicode/str objects is a problem for dictionary lookup
-
- :param object_to_check: dictionary, or list with names which should be converted from unicode to string.
- """
- if six.PY2:
- if isinstance(object_to_check, list):
- object_to_check = list(map(cls._convert_unicode_to_str, object_to_check))
-
- elif isinstance(object_to_check, dict):
- return {cls._encode_utf8_if_text(key): cls._convert_unicode_to_str(value)
- for key, value in object_to_check.items()}
-
- # unicode element
- elif isinstance(object_to_check, six.text_type):
- object_to_check = cls._encode_utf8_if_text(object_to_check)
-
- return object_to_check
-
@staticmethod
def _encode_utf8_if_text(item):
"""
@@ -363,11 +341,9 @@ class IOmodule(object):
structured_dataset_list.append(
self._recursively_load_dict_contents_from_group(hdf_file=hdf_file,
path=hdf_group.name + "/%s" % item))
- return self._convert_unicode_to_str(structured_dataset_list)
+ return structured_dataset_list
else:
- return self._convert_unicode_to_str(
- self._recursively_load_dict_contents_from_group(hdf_file=hdf_file,
- path=hdf_group.name + "/"))
+ return self._recursively_load_dict_contents_from_group(hdf_file=hdf_file, path=hdf_group.name + "/")
@classmethod
def _recursively_load_dict_contents_from_group(cls, hdf_file=None, path=None):
diff --git a/scripts/AbinsModules/LoadCRYSTAL.py b/scripts/AbinsModules/LoadCRYSTAL.py
index 51b8a557ba3..2fd57623046 100644
--- a/scripts/AbinsModules/LoadCRYSTAL.py
+++ b/scripts/AbinsModules/LoadCRYSTAL.py
@@ -537,9 +537,8 @@ class LoadCRYSTAL(AbinsModules.GeneralAbInitioProgram):
end_message = ["INFORMATION", "*******************************************************************************",
"GAMMA"]
- if not six.PY2:
- for i, item in enumerate(end_message):
- end_message[i] = bytes(item, "utf8")
+ for i, item in enumerate(end_message):
+ end_message[i] = bytes(item, "utf8")
while not self._parser.file_end(file_obj=file_obj):
diff --git a/scripts/AbinsModules/LoadDMOL3.py b/scripts/AbinsModules/LoadDMOL3.py
index 63b53767be0..205757c3628 100644
--- a/scripts/AbinsModules/LoadDMOL3.py
+++ b/scripts/AbinsModules/LoadDMOL3.py
@@ -254,9 +254,8 @@ class LoadDMOL3(AbinsModules.GeneralAbInitioProgram):
end_msg = "Molecular Mass:"
key = "Atom"
- if not six.PY2:
- end_msg = bytes(end_msg, "utf8")
- key = bytes(key, "utf8")
+ end_msg = bytes(end_msg, "utf8")
+ key = bytes(key, "utf8")
while not self._parser.file_end(file_obj=obj_file):
line = obj_file.readline()
diff --git a/scripts/AbinsModules/LoadGAUSSIAN.py b/scripts/AbinsModules/LoadGAUSSIAN.py
index 24655f61968..b830b5b852f 100644
--- a/scripts/AbinsModules/LoadGAUSSIAN.py
+++ b/scripts/AbinsModules/LoadGAUSSIAN.py
@@ -196,9 +196,8 @@ class LoadGAUSSIAN(AbinsModules.GeneralAbInitioProgram):
end_msg = "Molecular mass:"
key = "Atom"
- if not six.PY2:
- end_msg = bytes(end_msg, "utf8")
- key = bytes(key, "utf8")
+ end_msg = bytes(end_msg, "utf8")
+ key = bytes(key, "utf8")
while not self._parser.file_end(file_obj=file_obj):
diff --git a/scripts/Diffraction/isis_powder/routines/common.py b/scripts/Diffraction/isis_powder/routines/common.py
index c7cba46e74b..4024a1ac123 100644
--- a/scripts/Diffraction/isis_powder/routines/common.py
+++ b/scripts/Diffraction/isis_powder/routines/common.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six import PY2
import collections
import warnings
@@ -521,14 +520,7 @@ def read_masking_file(masking_file_path):
all_banks_masking_list = []
bank_masking_list = []
- # Python > 3 requires the encoding to be included so an Angstrom
- # symbol can be read, I'm assuming all file read here are
- # `latin-1` which may not be true in the future. Python 2 `open`
- # doesn't have an encoding option
- if PY2:
- encoding = {}
- else:
- encoding = {"encoding": "latin-1"}
+ encoding = {"encoding": "latin-1"}
with open(masking_file_path, **encoding) as mask_file:
for line in mask_file:
if 'bank' in line:
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index c018c934e2a..671b3edd903 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -352,10 +352,7 @@ def get_std_out_buffer_obj():
# Because of the way that strings and bytes
# have changed between Python 2/3 we need to
# return a buffer which is appropriate to the current version
- if six.PY2:
- return io.BytesIO()
- elif six.PY3:
- return io.StringIO()
+ return io.StringIO()
if __name__ == "__main__":
diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py
index d030a61dc49..d37ee5404ff 100644
--- a/scripts/Engineering/EnginX.py
+++ b/scripts/Engineering/EnginX.py
@@ -574,18 +574,11 @@ def focus_texture_mode(run_number, van_curves, van_int, focus_directory, focus_g
banks = {}
# read the csv file to work out the banks
# ensure csv reading works on python 2 or 3
- if not six.PY2:
- with open(dg_file, 'r', newline='', encoding='utf-8') as grouping_file:
- group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
+ with open(dg_file, 'r', newline='', encoding='utf-8') as grouping_file:
+ group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
- for row in group_reader:
- banks.update({row[0]: ','.join(row[1:])})
- else:
- with open(dg_file, 'r') as grouping_file:
- group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
-
- for row in group_reader:
- banks.update({row[0]: ','.join(row[1:])})
+ for row in group_reader:
+ banks.update({row[0]: ','.join(row[1:])})
# loop through the banks described in the csv, focusing and saing them out
for bank in banks:
diff --git a/scripts/SANS/sans/command_interface/ISISCommandInterface.py b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
index 3e55da0f30a..5c58c7705e1 100644
--- a/scripts/SANS/sans/command_interface/ISISCommandInterface.py
+++ b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
@@ -29,10 +29,6 @@ from sans.common.general_functions import (convert_bank_name_to_detector_type_is
from sans.gui_logic.models.RowEntries import RowEntries
from sans.sans_batch import SANSBatchReduction, SANSCentreFinder
-if six.PY2:
- # This can be swapped with in box FileNotFoundError
- FileNotFoundError = IOError
-
# Disable plotting if running outside Mantidplot
try:
diff --git a/scripts/test/Abins/AbinsIOmoduleTest.py b/scripts/test/Abins/AbinsIOmoduleTest.py
index 863012ac12e..a926a4ae571 100644
--- a/scripts/test/Abins/AbinsIOmoduleTest.py
+++ b/scripts/test/Abins/AbinsIOmoduleTest.py
@@ -100,31 +100,6 @@ class AbinsIOmoduleTest(unittest.TestCase):
self.assertRaises(ValueError, self.loader.load, list_of_datasets=1)
- def _py2_unicode_laundering(self):
- if six.PY2:
- unit_data_list = [u'1 Ã…', u'2 Ã…', u'3 Ã…']
- cleaned_data_list = IOmodule._convert_unicode_to_str(unit_data_list)
- self.assertNotIn(u'2 Ã…', cleaned_data_list)
- self.assertIn('2 \xc3\x85', cleaned_data_list)
-
- unit_data_nested = [[u'1 Ã…', u'2 Ã…'], [u'3 Ã…', u'4 Ã…']]
- cleaned_data_nested = IOmodule._convert_unicode_to_str(unit_data_nested)
- self.assertNotIn(u'3 Ã…', cleaned_data_nested[1])
- self.assertIn('3 \xc3\x85', cleaned_data_nested[1])
-
- unit_data_dict = {u'1 Ã…': 1, u'2 Ã…': 2,
- 'tens': {u'10 Ã…': 10, u'20 Ã…': 20}}
- cleaned_data_dict = IOmodule._convert_unicode_to_str(unit_data_dict)
- self.assertNotIn(u'2 Ã…', cleaned_data_dict)
- self.assertNotIn(u'10 Ã…', cleaned_data_dict['tens'])
- self.assertIn('10 \xc3\x85', cleaned_data_dict['tens'])
-
- for item in ('x', 1, 2.34, (1, 2)):
- self.assertEqual(IOmodule._convert_unicode_to_str(item), item)
-
- self.assertIsInstance(IOmodule._convert_unicode_to_str(np.ones(5)),
- np.ndarray)
-
def runTest(self):
self._save_stuff()
@@ -142,7 +117,6 @@ class AbinsIOmoduleTest(unittest.TestCase):
self._loading_datasets()
self._loading_structured_datasets()
- self._py2_unicode_laundering()
if __name__ == '__main__':
unittest.main()
diff --git a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
index d5b9ae8fbe5..bfd635a77ea 100644
--- a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
+++ b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
@@ -223,7 +223,7 @@ class BatchCsvParserTest(unittest.TestCase):
expected_file_path = "/foo/bar.csv"
parser = BatchCsvParser()
- patchable = "__builtin__.open" if six.PY2 else "builtins.open"
+ patchable = "builtins.open"
with mock.patch(patchable, mocked_handle):
parser.save_batch_file(rows=[], file_path=expected_file_path)
@@ -255,7 +255,7 @@ class BatchCsvParserTest(unittest.TestCase):
mocked_handle = mock.mock_open()
parser = BatchCsvParser()
- patchable = "__builtin__.open" if six.PY2 else "builtins.open"
+ patchable = "builtins.open"
with mock.patch(patchable, mocked_handle):
parser.save_batch_file(rows=[test_row], file_path='')
diff --git a/scripts/test/SANS/command_interface/isis_command_interface_test.py b/scripts/test/SANS/command_interface/isis_command_interface_test.py
index d8f73525357..34068584c0b 100644
--- a/scripts/test/SANS/command_interface/isis_command_interface_test.py
+++ b/scripts/test/SANS/command_interface/isis_command_interface_test.py
@@ -14,9 +14,6 @@ import six
from mantid.py3compat import mock
from sans.command_interface.ISISCommandInterface import MaskFile
-if six.PY2:
- FileNotFoundError = IOError
-
class ISISCommandInterfaceTest(unittest.TestCase):
def test_mask_file_raises_for_empty_file_name(self):
--
GitLab
From 3d9baeb5deb99b039357d1257adab6c1390e12c5 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:41:31 +0000
Subject: [PATCH 10/37] RE #27722 Remove PY3 imported from six
---
.../mantid/kernel/funcinspect.py | 43 +------------------
.../mantid/py3compat/__init__.py | 2 +-
.../algorithms/SelectNexusFilesByMetadata.py | 5 +--
.../lib/systemtests/systemtesting.py | 6 +--
.../sphinxext/mantiddoc/directives/diagram.py | 4 +-
.../reduce4circleGUI.py | 3 +-
scripts/Interface/reduction_application.py | 3 +-
.../reduction_gui/instruments/interface.py | 3 +-
.../settings/application_settings.py | 3 +-
.../reduction_gui/widgets/sans/eqsans_data.py | 3 +-
.../widgets/sans/eqsans_instrument.py | 3 +-
.../widgets/sans/hfir_detector.py | 3 +-
.../widgets/sans/hfir_instrument.py | 3 +-
.../widgets/sans/hfir_sample_data.py | 3 +-
.../ui/sans_isis/settings_diagnostic_tab.py | 4 +-
scripts/SANS/SANSUtility.py | 13 ++----
.../gui_logic/models/batch_process_runner.py | 3 +-
scripts/test/Abins/AbinsSDataTest.py | 11 +++--
18 files changed, 27 insertions(+), 91 deletions(-)
diff --git a/Framework/PythonInterface/mantid/kernel/funcinspect.py b/Framework/PythonInterface/mantid/kernel/funcinspect.py
index 6833bf4531d..5ad989c9abe 100644
--- a/Framework/PythonInterface/mantid/kernel/funcinspect.py
+++ b/Framework/PythonInterface/mantid/kernel/funcinspect.py
@@ -17,8 +17,6 @@ import opcode
import inspect
import sys
import dis
-from six import PY3
-
def replace_signature(func, signature):
"""
@@ -107,45 +105,8 @@ def decompile(code_object):
ins = decompile(f.f_code)
"""
instructions = []
-
- if PY3:
- for ins in dis.get_instructions(code_object):
- instructions.append( (ins.offset, ins.opcode, ins.opname, ins.arg, ins.argval) )
- else:
- code = code_object.co_code
- variables = code_object.co_cellvars + code_object.co_freevars
- n = len(code)
- i = 0
- e = 0
- while i < n:
- i_offset = i
- i_opcode = ord(code[i])
- i = i + 1
- if i_opcode >= opcode.HAVE_ARGUMENT:
- i_argument = ord(code[i]) + (ord(code[i+1]) << (4*2)) + e
- i = i + 2
- if i_opcode == opcode.EXTENDED_ARG:
- e = i_argument << 16
- else:
- e = 0
- if i_opcode in opcode.hasconst:
- i_arg_value = repr(code_object.co_consts[i_argument])
- elif i_opcode in opcode.hasname:
- i_arg_value = code_object.co_names[i_argument]
- elif i_opcode in opcode.hasjrel:
- i_arg_value = repr(i + i_argument)
- elif i_opcode in opcode.haslocal:
- i_arg_value = code_object.co_varnames[i_argument]
- elif i_opcode in opcode.hascompare:
- i_arg_value = opcode.cmp_op[i_argument]
- elif i_opcode in opcode.hasfree:
- i_arg_value = variables[i_argument]
- else:
- i_arg_value = i_argument
- else:
- i_argument = None
- i_arg_value = None
- instructions.append( (i_offset, i_opcode, opcode.opname[i_opcode], i_argument, i_arg_value) )
+ for ins in dis.get_instructions(code_object):
+ instructions.append( (ins.offset, ins.opcode, ins.opname, ins.arg, ins.argval) )
return instructions
#-------------------------------------------------------------------------------
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index cc7bbda114b..09fe0ac920b 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -79,7 +79,7 @@ if not hasattr(six, "ensure_str"):
raise TypeError("not expecting type '%s'" % type(s))
if isinstance(s, text_type):
s = s.encode(encoding, errors)
- elif PY3 and isinstance(s, binary_type):
+ elif isinstance(s, binary_type):
s = s.decode(encoding, errors)
return s
diff --git a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
index 168ca591adc..b0078ced8b3 100644
--- a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
+++ b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
@@ -8,8 +8,6 @@
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
-from six import PY3
-
class SelectNexusFilesByMetadata(PythonAlgorithm):
@@ -106,8 +104,7 @@ class SelectNexusFilesByMetadata(PythonAlgorithm):
if str(value.dtype).startswith('|S'):
# string value, need to quote for eval
- if PY3:
- value = value.decode()
+ value = value.decode()
toeval += '\"' + value + '\"'
else:
toeval += str(value)
diff --git a/Testing/SystemTests/lib/systemtests/systemtesting.py b/Testing/SystemTests/lib/systemtests/systemtesting.py
index 57f9f1d41d3..be7db3fb06b 100644
--- a/Testing/SystemTests/lib/systemtests/systemtesting.py
+++ b/Testing/SystemTests/lib/systemtests/systemtesting.py
@@ -19,7 +19,6 @@ if os.environ.get('MANTID_FRAMEWORK_CONDA_SYSTEMTEST'):
import matplotlib
# =========================================================
-from six import PY3
import datetime
import difflib
import imp
@@ -762,9 +761,8 @@ class TestSuite(object):
self._result.status = status
self._result.addItem(['status', status])
# Dump std out so we know what happened
- if PY3:
- if isinstance(output, bytes):
- output = output.decode()
+ if isinstance(output, bytes):
+ output = output.decode()
self._result.output = '\n' + output
all_lines = output.split('\n')
# Find the test results
diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py
index 4328e2801ab..fa7edb7f6ff 100644
--- a/docs/sphinxext/mantiddoc/directives/diagram.py
+++ b/docs/sphinxext/mantiddoc/directives/diagram.py
@@ -9,7 +9,6 @@ from sphinx.locale import _ #pylint: disable=unused-import
import os
from string import Template
import subprocess
-from six import PY3
######################
#CONFIGURABLE OPTIONS#
@@ -93,8 +92,7 @@ class DiagramDirective(BaseDirective):
raise RuntimeError("Cannot find dot-file: '" + diagram_name + "' in '" + os.path.join(env.srcdir,"diagrams"))
out_src = Template(in_src).substitute(STYLE)
- if PY3:
- out_src = out_src.encode()
+ out_src = out_src.encode()
gviz = subprocess.Popen([dot_executable,"-Tpng","-o",out_path], stdin=subprocess.PIPE)
gviz.communicate(input=out_src)
gviz.wait()
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
index 8cada0a54ca..c3929ebdd98 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
@@ -62,8 +62,7 @@ if PYQT4:
SCROLL_AVAILABLE = True
except ImportError:
SCROLL_AVAILABLE = False
-if six.PY3:
- unicode = str
+unicode = str
# define constants
IndexFromSpice = 'From Spice (pre-defined)'
diff --git a/scripts/Interface/reduction_application.py b/scripts/Interface/reduction_application.py
index 568f51a9558..b1360f48e4b 100644
--- a/scripts/Interface/reduction_application.py
+++ b/scripts/Interface/reduction_application.py
@@ -30,8 +30,7 @@ except ImportError:
Logger("ReductionGUI").information('Using legacy ui importer')
from mantidplot import load_ui # noqa
-if six.PY3:
- unicode = str
+unicode = str
STARTUP_WARNING = ""
diff --git a/scripts/Interface/reduction_gui/instruments/interface.py b/scripts/Interface/reduction_gui/instruments/interface.py
index 665ef77cf3a..1e4d6694cf2 100644
--- a/scripts/Interface/reduction_gui/instruments/interface.py
+++ b/scripts/Interface/reduction_gui/instruments/interface.py
@@ -15,8 +15,7 @@ import os
import traceback
from reduction_gui.reduction.scripter import BaseReductionScripter
-if six.PY3:
- unicode = str
+unicode = str
class InstrumentInterface(object):
diff --git a/scripts/Interface/reduction_gui/settings/application_settings.py b/scripts/Interface/reduction_gui/settings/application_settings.py
index 2d76248b1b7..a06153d25f8 100644
--- a/scripts/Interface/reduction_gui/settings/application_settings.py
+++ b/scripts/Interface/reduction_gui/settings/application_settings.py
@@ -19,8 +19,7 @@ From mantidplot:
from qtpy.QtCore import (QObject, QSettings, Signal) # noqa
-if six.PY3:
- unicode = str
+unicode = str
class GeneralSettings(QObject):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
index a9724c2dc1d..4128405f9ab 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
@@ -20,8 +20,7 @@ except ImportError:
Logger("DataSetsWidget").information('Using legacy ui importer')
from mantidplot import load_ui
-if six.PY3:
- unicode = str
+unicode = str
class DataSetsWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
index 2bba7476345..a39a79fb4f2 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
@@ -21,8 +21,7 @@ except ImportError:
from mantidplot import load_ui
from mantid.api import AnalysisDataService
from mantid.simpleapi import ExtractMask
-if six.PY3:
- unicode = str
+unicode = str
class SANSInstrumentWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
index 69afaf9fb63..cd3936b1cb8 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
@@ -21,8 +21,7 @@ except ImportError:
from mantid.api import AnalysisDataService
from reduction_gui.reduction.scripter import execute_script
-if six.PY3:
- unicode = str
+unicode = str
class DetectorWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
index 323e482bb88..37790ffbe06 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
@@ -21,8 +21,7 @@ except ImportError:
from mantidplot import load_ui
from mantid.api import AnalysisDataService
from mantid.simpleapi import ExtractMask
-if six.PY3:
- unicode = str
+unicode = str
class SANSInstrumentWidget(BaseWidget):
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
index 2d06a5dac03..247f35ca5e7 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
@@ -19,8 +19,7 @@ except ImportError:
Logger("DirectBeam").information('Using legacy ui importer')
from mantidplot import load_ui
-if six.PY3:
- unicode = str
+unicode = str
class DirectBeam(BaseWidget):
diff --git a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
index ceea88f193a..21ad6855108 100644
--- a/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
+++ b/scripts/Interface/ui/sans_isis/settings_diagnostic_tab.py
@@ -14,7 +14,6 @@ and helps the developer to identify issues.
from abc import ABCMeta, abstractmethod
import os
from qtpy import QtWidgets
-from six import PY3
from mantidqt.utils.qt import load_ui
@@ -22,8 +21,7 @@ from mantid import UsageService
from mantid.kernel import FeatureType
from sans.gui_logic.gui_common import (GENERIC_SETTINGS, JSON_SUFFIX, load_file)
-if PY3:
- unicode = str
+unicode = str
Ui_SettingsDiagnosticTab, _ = load_ui(__file__, "settings_diagnostic_tab.ui")
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index 91a61ef1ac6..0215dcafafe 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -17,7 +17,7 @@ import inspect
import math
import os
import re
-from six import types, PY3
+from six import types
import numpy as np
import h5py as h5
@@ -735,14 +735,9 @@ def check_if_is_event_data(file_name):
is_event_mode = False
for value in list(first_entry.values()):
if "NX_class" in value.attrs:
- if PY3:
- if "NXevent_data" == value.attrs["NX_class"].decode() :
- is_event_mode = True
- break
- else:
- if "NXevent_data" == value.attrs["NX_class"]:
- is_event_mode = True
- break
+ if "NXevent_data" == value.attrs["NX_class"].decode() :
+ is_event_mode = True
+ break
return is_event_mode
diff --git a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
index d301d0a0dd9..5d3b9bd370b 100644
--- a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
+++ b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
@@ -112,7 +112,6 @@ class BatchProcessRunner(QObject):
def _handle_err(self, index, e):
# We manually have to extract out the traceback, since going to a str for Qt signals will strip this
- if six.PY3:
- self._logger.error(''.join(traceback.format_tb(e.__traceback__)))
+ self._logger.error(''.join(traceback.format_tb(e.__traceback__)))
self._logger.error(str(e))
self.row_failed_signal.emit(index, str(e))
diff --git a/scripts/test/Abins/AbinsSDataTest.py b/scripts/test/Abins/AbinsSDataTest.py
index b12e16257f8..fff8944b866 100644
--- a/scripts/test/Abins/AbinsSDataTest.py
+++ b/scripts/test/Abins/AbinsSDataTest.py
@@ -33,11 +33,10 @@ class AbinsSDataTest(unittest.TestCase):
s_data.set({'frequencies': np.linspace(105, 145, 5),
'atom_1': {'s': {'order_1': np.array([0., 0.001, 1., 1., 0., 0.,])}}})
- if six.PY3: # assertLogs is available from Python 3.4 and up
- with self.assertRaises(AssertionError):
- with self.assertLogs(logger=self.logger, level='WARNING'):
- s_data.check_thresholds(logger=self.logger)
-
- AbinsParameters.sampling['s_absolute_threshold'] = 0.5
+ with self.assertRaises(AssertionError):
with self.assertLogs(logger=self.logger, level='WARNING'):
s_data.check_thresholds(logger=self.logger)
+
+ AbinsParameters.sampling['s_absolute_threshold'] = 0.5
+ with self.assertLogs(logger=self.logger, level='WARNING'):
+ s_data.check_thresholds(logger=self.logger)
--
GitLab
From c93fe1c38805a5fc08cccf43444c0a1ec77ed457 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:46:41 +0000
Subject: [PATCH 11/37] RE #27722 Remove add_metaclass imported from six
---
.../sans/state/StateObjects/StateCalculateTransmission.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
index 254046d311e..c98c04f6a76 100644
--- a/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
+++ b/scripts/SANS/sans/state/StateObjects/StateCalculateTransmission.py
@@ -11,7 +11,6 @@
import json
import copy
import abc
-from six import add_metaclass
from sans.state.JsonSerializable import JsonSerializable
from sans.common.enums import (RebinType, RangeStepType, FitType, DataType, SANSInstrument)
@@ -336,8 +335,7 @@ def set_default_monitors(calculate_transmission_info, data_info):
# ---------------------------------------
# State builders
# ---------------------------------------
-@add_metaclass(abc.ABCMeta)
-class StateCalculateTransmissionBuilderCommon(object):
+class StateCalculateTransmissionBuilderCommon(object, metaclass=abc.ABCMeta):
def __init__(self, state):
self.state = state
--
GitLab
From 96174646b651f8b0437c79f3144d0eda91bb22dc Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:51:28 +0000
Subject: [PATCH 12/37] RE #27722 Replace assertRaisesRegex imported from six
---
.../ReflectometryILLSumForegroundTest.py | 4 +-
.../test/ISISPowderAbsorptionTest.py | 6 +--
.../isis_powder/test/ISISPowderCommonTest.py | 34 ++++++++---------
.../test/ISISPowderInstrumentSettingsTest.py | 12 +++---
.../test/ISISPowderSampleDetailsTest.py | 38 +++++++++----------
.../test/ISISPowderYamlParserTest.py | 16 ++++----
.../cropping/test/test_cropping_model.py | 6 +--
7 files changed, 55 insertions(+), 61 deletions(-)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
index a6e4976dfd2..b9248af301e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILLSumForegroundTest.py
@@ -215,7 +215,7 @@ class ReflectometryILLSumForegroundTest(unittest.TestCase):
'child': True
}
alg = create_algorithm('ReflectometryILLSumForeground', **args)
- self.assertRaisesRegexp(RuntimeError, 'Some invalid Properties found', alg.execute)
+ self.assertRaisesRegex(RuntimeError, 'Some invalid Properties found', alg.execute)
self.assertTrue(alg.isExecuted)
def testNotSummedDirectForegroundRaises(self):
@@ -231,7 +231,7 @@ class ReflectometryILLSumForegroundTest(unittest.TestCase):
'child': True
}
alg = create_algorithm('ReflectometryILLSumForeground', **args)
- self.assertRaisesRegexp(RuntimeError, 'Some invalid Properties found', alg.execute)
+ self.assertRaisesRegex(RuntimeError, 'Some invalid Properties found', alg.execute)
self.assertTrue(alg.isExecuted)
def testReflectedBeamSumInLambdaNoRotation(self):
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
index ffb238a4a74..801887642f4 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
@@ -7,8 +7,6 @@
import mantid.simpleapi as mantid
import unittest
-from six import assertRaisesRegex
-
from isis_powder.routines import absorb_corrections, SampleDetails
@@ -41,11 +39,11 @@ class ISISPowderAbsorptionTest(unittest.TestCase):
modified_dict.pop(blacklisted_key)
# Check that is raises an error
- with assertRaisesRegex(self, KeyError, "The following key was not found in the advanced configuration"):
+ with self.assertRaisesRegex(KeyError, "The following key was not found in the advanced configuration"):
absorb_corrections.create_vanadium_sample_details_obj(config_dict=modified_dict)
# Then check the error actually has the key name in it
- with assertRaisesRegex(self, KeyError, blacklisted_key):
+ with self.assertRaisesRegex(KeyError, blacklisted_key):
absorb_corrections.create_vanadium_sample_details_obj(config_dict=modified_dict)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
index f275fbd63dc..21284c0a3e5 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
@@ -7,8 +7,6 @@
import mantid.simpleapi as mantid # Have to import Mantid to setup paths
import unittest
-from six import assertRaisesRegex
-
from isis_powder.routines import common, common_enums, SampleDetails
@@ -21,12 +19,12 @@ class ISISPowderCommonTest(unittest.TestCase):
dict_with_key = {correct_key_name: expected_val}
# Check it correctly raises
- with assertRaisesRegex(self, KeyError, "The field '" + missing_key_name + "' is required"):
+ with self.assertRaisesRegex(KeyError, "The field '" + missing_key_name + "' is required"):
common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=missing_key_name)
# Check it correctly appends the passed error message when raising
appended_e_msg = "test append message"
- with assertRaisesRegex(self, KeyError, appended_e_msg):
+ with self.assertRaisesRegex(KeyError, appended_e_msg):
common.cal_map_dictionary_key_helper(dictionary=dict_with_key, key=missing_key_name,
append_to_error_message=appended_e_msg)
@@ -58,15 +56,15 @@ class ISISPowderCommonTest(unittest.TestCase):
bank_list.append(mantid.CreateSampleWorkspace(OutputWorkspace=out_name, XMin=0, XMax=1100, BinWidth=1))
# Check a list of WS and single cropping value is detected
- with assertRaisesRegex(self, ValueError, "The cropping values were not in a list or tuple type"):
+ with self.assertRaisesRegex(ValueError, "The cropping values were not in a list or tuple type"):
common.crop_banks_using_crop_list(bank_list=bank_list, crop_values_list=1000)
# Check a list of cropping values and a single workspace is detected
- with assertRaisesRegex(self, RuntimeError, "Attempting to use list based cropping"):
+ with self.assertRaisesRegex(RuntimeError, "Attempting to use list based cropping"):
common.crop_banks_using_crop_list(bank_list=bank_list[0], crop_values_list=cropping_value_list)
# What about a mismatch between the number of cropping values and workspaces
- with assertRaisesRegex(self, RuntimeError, "The number of TOF cropping values does not match"):
+ with self.assertRaisesRegex(RuntimeError, "The number of TOF cropping values does not match"):
common.crop_banks_using_crop_list(bank_list=bank_list[1:], crop_values_list=cropping_value_list)
# Check we can crop a single workspace from the list
@@ -95,11 +93,11 @@ class ISISPowderCommonTest(unittest.TestCase):
bank_list.append(mantid.CreateSampleWorkspace(OutputWorkspace=out_name, XMin=x_min, XMax=x_max, BinWidth=1))
# Check a list of WS and non list or tuple
- with assertRaisesRegex(self, ValueError, "The cropping values were not in a list or tuple type"):
+ with self.assertRaisesRegex(ValueError, "The cropping values were not in a list or tuple type"):
common.crop_banks_using_crop_list(bank_list=bank_list, crop_values_list=1000)
# Check a cropping value and a single workspace is detected
- with assertRaisesRegex(self, RuntimeError, "Attempting to use list based cropping"):
+ with self.assertRaisesRegex(RuntimeError, "Attempting to use list based cropping"):
common.crop_banks_using_crop_list(bank_list=bank_list[0], crop_values_list=cropping_value)
# Check we can crop a single workspace from the list
@@ -206,7 +204,7 @@ class ISISPowderCommonTest(unittest.TestCase):
with self.assertRaises(KeyError):
common.dictionary_key_helper(dictionary=test_dictionary, key=bad_key_name)
- with assertRaisesRegex(self, KeyError, e_msg):
+ with self.assertRaisesRegex(KeyError, e_msg):
common.dictionary_key_helper(dictionary=test_dictionary, key=bad_key_name, exception_msg=e_msg)
self.assertEqual(common.dictionary_key_helper(dictionary=test_dictionary, key=good_key_name), 123)
@@ -310,11 +308,11 @@ class ISISPowderCommonTest(unittest.TestCase):
def test_generate_run_numbers_fails(self):
run_input_sting = "text-string"
- with assertRaisesRegex(self, ValueError, "Could not generate run numbers from this input"):
+ with self.assertRaisesRegex(ValueError, "Could not generate run numbers from this input"):
common.generate_run_numbers(run_number_string=run_input_sting)
# Check it says what the actual string was
- with assertRaisesRegex(self, ValueError, run_input_sting):
+ with self.assertRaisesRegex(ValueError, run_input_sting):
common.generate_run_numbers(run_number_string=run_input_sting)
def test_load_current_normalised_workspace(self):
@@ -444,14 +442,14 @@ class ISISPowderCommonTest(unittest.TestCase):
NumBanks=1, BankPixelWidth=1, XMax=10, BinWidth=1))
# What if the item passed in is not a list
err_msg_not_list = "was not a list"
- with assertRaisesRegex(self, RuntimeError, err_msg_not_list):
+ with self.assertRaisesRegex(RuntimeError, err_msg_not_list):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=None)
- with assertRaisesRegex(self, RuntimeError, err_msg_not_list):
+ with self.assertRaisesRegex(RuntimeError, err_msg_not_list):
common.rebin_workspace_list(workspace_list=None, bin_width_list=[])
# What about if the lists aren't the same length
- with assertRaisesRegex(self, ValueError, "does not match the number of banks"):
+ with self.assertRaisesRegex(ValueError, "does not match the number of banks"):
incorrect_number_bin_widths = [1] * (number_of_ws - 1)
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=incorrect_number_bin_widths)
@@ -480,10 +478,10 @@ class ISISPowderCommonTest(unittest.TestCase):
# Are the lengths checked
incorrect_length = [1] * (number_of_ws - 1)
- with assertRaisesRegex(self, ValueError, "The number of starting bin values"):
+ with self.assertRaisesRegex(ValueError, "The number of starting bin values"):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=ws_bin_widths,
start_x_list=incorrect_length, end_x_list=end_x_list)
- with assertRaisesRegex(self, ValueError, "The number of ending bin values"):
+ with self.assertRaisesRegex(ValueError, "The number of ending bin values"):
common.rebin_workspace_list(workspace_list=ws_list, bin_width_list=ws_bin_widths,
start_x_list=start_x_list, end_x_list=incorrect_length)
@@ -588,7 +586,7 @@ class ISISPowderCommonTest(unittest.TestCase):
ws_file_name = "100" # Load POL100
# This should throw as the TOF ranges do not match
- with assertRaisesRegex(self, ValueError, "specified for this file do not have matching binning. Do the "):
+ with self.assertRaisesRegex(ValueError, "specified for this file do not have matching binning. Do the "):
common.subtract_summed_runs(ws_to_correct=sample_ws, instrument=ISISPowderMockInst(),
empty_sample_ws_string=ws_file_name)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
index 929cacec3a3..727cdc13bc9 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
@@ -7,7 +7,7 @@
import unittest
import warnings
-from six import assertRaisesRegex, assertRegex
+from six import assertRegex
from isis_powder.routines import instrument_settings, param_map_entry
@@ -18,7 +18,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
- with assertRaisesRegex(self, AttributeError, "is required but was not set or passed"):
+ with self.assertRaisesRegex(AttributeError, "is required but was not set or passed"):
foo = inst_settings_obj.script_facing_name
del foo
@@ -28,7 +28,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
# Check it still prints the acceptable values when it fails
- with assertRaisesRegex(self, AttributeError, "A BAR"):
+ with self.assertRaisesRegex(AttributeError, "A BAR"):
foo = inst_settings_obj.script_facing_name
del foo
@@ -37,7 +37,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry])
- with assertRaisesRegex(self, AttributeError, "Please contact the development team"):
+ with self.assertRaisesRegex(AttributeError, "Please contact the development team"):
foo = inst_settings_obj.not_known
del foo
@@ -141,7 +141,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
# First test we cannot set it to a different value
incorrect_value_dict = {"user_facing_name": "wrong"}
- with assertRaisesRegex(self, ValueError, "The user specified value: 'wrong' is unknown"):
+ with self.assertRaisesRegex(ValueError, "The user specified value: 'wrong' is unknown"):
instrument_settings.InstrumentSettings(param_map=[param_entry],
adv_conf_dict=incorrect_value_dict)
@@ -157,7 +157,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
def test_param_map_rejects_enum_missing_friendly_name(self):
# Check that is the friendly name is not set it is correctly detected
- with assertRaisesRegex(self, RuntimeError,
+ with self.assertRaisesRegex(RuntimeError,
"'enum_friendly_name' was not set. Please contact development team."):
param_map_entry.ParamMapEntry(ext_name="user_facing_name", int_name="script_facing_name",
enum_class=BadSampleEnum)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index 671b3edd903..3c89e845694 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -11,7 +11,7 @@ import unittest
from isis_powder.routines import sample_details
-from six import assertRaisesRegex, assertRegex
+from six import assertRegex
class ISISPowderSampleDetailsTest(unittest.TestCase):
@@ -59,34 +59,34 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
char_input_value = 'a'
# Check it handles empty input
- with assertRaisesRegex(self, ValueError, "Could not convert the height to a number"):
+ with self.assertRaisesRegex(ValueError, "Could not convert the height to a number"):
sample_details.SampleDetails(height=empty_input_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Does it handle bad input and tell us what we put in
- with assertRaisesRegex(self, ValueError, ".*to a number. The input was: '" + char_input_value + "'"):
+ with self.assertRaisesRegex(ValueError, ".*to a number. The input was: '" + char_input_value + "'"):
sample_details.SampleDetails(height=char_input_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Does it indicate which field was incorrect
- with assertRaisesRegex(self, ValueError, "radius"):
+ with self.assertRaisesRegex(ValueError, "radius"):
sample_details.SampleDetails(height=good_input, radius=char_input_value,
center=good_center_input, shape="cylinder")
# Can it handle bad center values
- with assertRaisesRegex(self, ValueError, "center"):
+ with self.assertRaisesRegex(ValueError, "center"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=["", 2, 3], shape="cylinder")
# Does it throw if were not using a list for the input
- with assertRaisesRegex(self, ValueError, "must be specified as a list of X, Y, Z"):
+ with self.assertRaisesRegex(ValueError, "must be specified as a list of X, Y, Z"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=1, shape="cylinder")
# Does it throw if we are using a list of incorrect length (e.g. not 3D)
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[], shape="cylinder")
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[1, 2], shape="cylinder")
- with assertRaisesRegex(self, ValueError, "must have three values corresponding to"):
+ with self.assertRaisesRegex(ValueError, "must have three values corresponding to"):
sample_details.SampleDetails(height=good_input, radius=good_input, center=[1, 2, 3, 4], shape="cylinder")
def test_constructor_with_impossible_val(self):
@@ -98,22 +98,22 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
negative_string = "-1"
# Check it handles zero
- with assertRaisesRegex(self, ValueError, "The value set for height was: 0"):
+ with self.assertRaisesRegex(ValueError, "The value set for height was: 0"):
sample_details.SampleDetails(height=zero_value, radius=good_input,
center=good_center_input, shape="cylinder")
# Very small negative
- with assertRaisesRegex(self, ValueError, "which is impossible for a physical object"):
+ with self.assertRaisesRegex(ValueError, "which is impossible for a physical object"):
sample_details.SampleDetails(height=good_input, radius=negative_value,
center=good_center_input, shape="cylinder")
# Integer negative
- with assertRaisesRegex(self, ValueError, "The value set for height was: -1"):
+ with self.assertRaisesRegex(ValueError, "The value set for height was: -1"):
sample_details.SampleDetails(height=negative_int, radius=good_input,
center=good_center_input, shape="cylinder")
# String negative
- with assertRaisesRegex(self, ValueError, "The value set for radius was: -1"):
+ with self.assertRaisesRegex(ValueError, "The value set for radius was: -1"):
sample_details.SampleDetails(height=good_input, radius=negative_string,
center=good_center_input, shape="cylinder")
@@ -125,7 +125,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertIsNotNone(sample_details_obj.material_object)
# Check that the material is now immutable
- with assertRaisesRegex(self, RuntimeError, "The material has already been set to the above details"):
+ with self.assertRaisesRegex(RuntimeError, "The material has already been set to the above details"):
sample_details_obj.set_material(chemical_formula='V')
# Check resetting it works
@@ -142,7 +142,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertIsNone(sample_details_obj.material_object)
# Check we cannot set a material property without setting the underlying material
- with assertRaisesRegex(self, RuntimeError, "The material has not been set"):
+ with self.assertRaisesRegex(RuntimeError, "The material has not been set"):
sample_details_obj.set_material_properties(absorption_cross_section=1.0, scattering_cross_section=2.0)
# Check that with a material object we are allowed to set material properties
@@ -178,7 +178,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertEqual(material_obj_number_density.number_density, number_density_sample)
# Check that it raises an error if we have a non-elemental formula without number density
- with assertRaisesRegex(self, ValueError, "A number density formula must be set on a chemical formula"):
+ with self.assertRaisesRegex(ValueError, "A number density formula must be set on a chemical formula"):
sample_details._Material(chemical_formula=chemical_formula_complex)
# Check it constructs if it is given the number density too
@@ -195,14 +195,14 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
good_scattering = 2.0
material_obj = sample_details._Material(chemical_formula='V')
- with assertRaisesRegex(self, ValueError, "absorption_cross_section was: -1 which is impossible for a physical "
+ with self.assertRaisesRegex(ValueError, "absorption_cross_section was: -1 which is impossible for a physical "
"object"):
material_obj.set_material_properties(abs_cross_sect=bad_absorb, scattering_cross_sect=good_scattering)
# Check the immutability flag has not been set on a failure
self.assertFalse(material_obj._is_material_props_set)
- with assertRaisesRegex(self, ValueError, "scattering_cross_section was: 0"):
+ with self.assertRaisesRegex(ValueError, "scattering_cross_section was: 0"):
material_obj.set_material_properties(abs_cross_sect=good_absorb, scattering_cross_sect=bad_scattering)
# Check nothing has been set yet
@@ -216,7 +216,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
self.assertEqual(material_obj.scattering_cross_section, float(good_scattering))
# Check we cannot set it twice and fields do not change
- with assertRaisesRegex(self, RuntimeError, "The material properties have already been set"):
+ with self.assertRaisesRegex(RuntimeError, "The material properties have already been set"):
material_obj.set_material_properties(abs_cross_sect=999, scattering_cross_sect=999)
self.assertEqual(material_obj.absorption_cross_section, float(good_absorb))
self.assertEqual(material_obj.scattering_cross_section, float(good_scattering))
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
index 5f160ffa9ba..8fa884689f9 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
@@ -8,8 +8,6 @@ import tempfile
import os
import unittest
import warnings
-from six import assertRaisesRegex
-
from isis_powder.routines import yaml_parser
@@ -77,7 +75,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
self.fail("File exists after deleting cannot continue this test")
# Check the error message is there
- with assertRaisesRegex(self, ValueError, "Config file not found at path"):
+ with self.assertRaisesRegex(ValueError, "Config file not found at path"):
yaml_parser.get_run_dictionary(run_number_string="1", file_path=file_path)
def test_is_run_range_unbounded(self):
@@ -103,7 +101,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "YAML files appears to be empty at"):
+ with self.assertRaisesRegex(ValueError, "YAML files appears to be empty at"):
yaml_parser.get_run_dictionary(run_number_string=1, file_path=file_path)
def test_run_number_not_found_gives_sane_err(self):
@@ -118,15 +116,15 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_handle.close()
# Test a value in the middle of 1-10
- with assertRaisesRegex(self, ValueError, "Run number 5 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 5 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string="5", file_path=file_path)
# Check on edge of invalid numbers
- with assertRaisesRegex(self, ValueError, "Run number 9 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 9 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string=9, file_path=file_path)
# What about a range of numbers
- with assertRaisesRegex(self, ValueError, "Run number 2 not recognised in cycle mapping file"):
+ with self.assertRaisesRegex(ValueError, "Run number 2 not recognised in cycle mapping file"):
yaml_parser.get_run_dictionary(run_number_string="2-8", file_path=file_path)
# Check valid number still works
@@ -141,7 +139,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "Seen multiple unbounded keys in mapping file"):
+ with self.assertRaisesRegex(ValueError, "Seen multiple unbounded keys in mapping file"):
yaml_parser.get_run_dictionary(run_number_string="11", file_path=file_path)
def test_yaml_sanity_detects_val_larger_than_unbound(self):
@@ -152,7 +150,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_path = file_handle.name
file_handle.close()
- with assertRaisesRegex(self, ValueError, "Found a run range in calibration mapping overlaps an unbounded run "
+ with self.assertRaisesRegex(ValueError, "Found a run range in calibration mapping overlaps an unbounded run "
"range"):
yaml_parser.get_run_dictionary(run_number_string="32", file_path=file_path)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
index 5abba91be69..75da21c3f47 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_model.py
@@ -45,9 +45,9 @@ class CroppingModelTest(unittest.TestCase):
self.assertEqual(self.model._clean_spectrum_numbers("2-1, 76-5, 3"), "1-2,5-76,3")
def test_clean_spectrum_numbers_equal_range(self):
- self.assertRaisesRegexp(ValueError,
- "Ranges cannot contain the same value twice. Invalid Range:*",
- self.model._clean_spectrum_numbers, "1-1, 76-76, 3")
+ self.assertRaisesRegex(ValueError,
+ "Ranges cannot contain the same value twice. Invalid Range:*",
+ self.model._clean_spectrum_numbers, "1-1, 76-76, 3")
def test_validate_and_clean_with_valid_input(self):
self.assertEqual(self.model.validate_and_clean_spectrum_numbers("1-6, 7-23, 46, 1"),
--
GitLab
From db0ce62219ab139209c61fffcf4cb6e049405596 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:53:43 +0000
Subject: [PATCH 13/37] RE #27722 Replace assertRegex imported from six
---
.../test/ISISPowderInstrumentSettingsTest.py | 14 ++++----
.../test/ISISPowderSampleDetailsTest.py | 34 +++++++++----------
2 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
index 727cdc13bc9..1dff03e963f 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
@@ -7,8 +7,6 @@
import unittest
import warnings
-from six import assertRegex
-
from isis_powder.routines import instrument_settings, param_map_entry
@@ -63,9 +61,9 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
inst_settings_obj = instrument_settings.InstrumentSettings(param_map=[param_entry], kwargs=keyword_args,
adv_conf_dict=adv_config)
- assertRegex(self, str(warning_capture[-1].message), "which was previously set to")
- assertRegex(self, str(warning_capture[-1].message), str(original_value))
- assertRegex(self, str(warning_capture[-1].message), str(new_value))
+ self.assertRegex(str(warning_capture[-1].message), "which was previously set to")
+ self.assertRegex(str(warning_capture[-1].message), str(original_value))
+ self.assertRegex(str(warning_capture[-1].message), str(new_value))
self.assertEqual(inst_settings_obj.script_facing_name, new_value)
@@ -90,9 +88,9 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
warnings.simplefilter("always")
inst_settings_obj.update_attributes(basic_config=config_dict)
- assertRegex(self, str(warning_capture[-1].message), "which was previously set to")
- assertRegex(self, str(warning_capture[-1].message), str(original_value))
- assertRegex(self, str(warning_capture[-1].message), str(new_value))
+ self.assertRegex(str(warning_capture[-1].message), "which was previously set to")
+ self.assertRegex(str(warning_capture[-1].message), str(original_value))
+ self.assertRegex(str(warning_capture[-1].message), str(new_value))
warnings_current_length = len(warning_capture)
# Then check that we only get one additional warning when replacing values again not two
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index 3c89e845694..67fce4425de 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -11,8 +11,6 @@ import unittest
from isis_powder.routines import sample_details
-from six import assertRegex
-
class ISISPowderSampleDetailsTest(unittest.TestCase):
def test_constructor(self):
@@ -242,19 +240,19 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
# Test with most defaults set
sample_details_obj.print_sample_details()
captured_std_out_default = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_default, "Height: " + str(float(expected_height)))
- assertRegex(self, captured_std_out_default, "Radius: " + str(float(expected_radius)))
- assertRegex(self, captured_std_out_default, "Center X:" + str(float(expected_center[0])))
- assertRegex(self, captured_std_out_default, "Material has not been set")
+ self.assertRegex(captured_std_out_default, "Height: " + str(float(expected_height)))
+ self.assertRegex(captured_std_out_default, "Radius: " + str(float(expected_radius)))
+ self.assertRegex(captured_std_out_default, "Center X:" + str(float(expected_center[0])))
+ self.assertRegex(captured_std_out_default, "Material has not been set")
# Test with material set but not number density
sys.stdout = std_out_buffer = get_std_out_buffer_obj()
sample_details_obj.set_material(chemical_formula=chemical_formula)
sample_details_obj.print_sample_details()
captured_std_out_material_default = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_default, "Material properties:")
- assertRegex(self, captured_std_out_material_default, "Chemical formula: " + chemical_formula)
- assertRegex(self, captured_std_out_material_default, "Number Density: Set from elemental properties")
+ self.assertRegex(captured_std_out_material_default, "Material properties:")
+ self.assertRegex(captured_std_out_material_default, "Chemical formula: " + chemical_formula)
+ self.assertRegex(captured_std_out_material_default, "Number Density: Set from elemental properties")
# Test with material and number density
sys.stdout = std_out_buffer = get_std_out_buffer_obj()
@@ -263,13 +261,13 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
number_density=expected_number_density)
sample_details_obj.print_sample_details()
captured_std_out_material_set = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_set, "Chemical formula: " + chemical_formula_two)
- assertRegex(self, captured_std_out_material_set, "Number Density: " + str(expected_number_density))
+ self.assertRegex(captured_std_out_material_set, "Chemical formula: " + chemical_formula_two)
+ self.assertRegex(captured_std_out_material_set, "Number Density: " + str(expected_number_density))
# Test with no material properties set - we can reuse buffer from previous test
- assertRegex(self, captured_std_out_material_default, "Absorption cross section: Calculated by Mantid")
- assertRegex(self, captured_std_out_material_default, "Scattering cross section: Calculated by Mantid")
- assertRegex(self, captured_std_out_material_default, "Note to manually override these call")
+ self.assertRegex(captured_std_out_material_default, "Absorption cross section: Calculated by Mantid")
+ self.assertRegex(captured_std_out_material_default, "Scattering cross section: Calculated by Mantid")
+ self.assertRegex(captured_std_out_material_default, "Note to manually override these call")
expected_abs_x_section = 2.13
expected_scattering_x_section = 5.32
@@ -280,10 +278,10 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
scattering_cross_section=expected_scattering_x_section)
sample_details_obj.print_sample_details()
captured_std_out_material_props = std_out_buffer.getvalue()
- assertRegex(self, captured_std_out_material_props, "Absorption cross section: "
- + str(expected_abs_x_section))
- assertRegex(self, captured_std_out_material_props, "Scattering cross section: "
- + str(expected_scattering_x_section))
+ self.assertRegex(captured_std_out_material_props, "Absorption cross section: "
+ + str(expected_abs_x_section))
+ self.assertRegex(captured_std_out_material_props, "Scattering cross section: "
+ + str(expected_scattering_x_section))
finally:
# Ensure std IO is restored. Do NOT remove this line as all std out will pipe into our buffer otherwise
sys.stdout = old_std_out
--
GitLab
From 29b753b7fb6c0b15c32285d26b38fb2bc3fff1c4 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 11:27:13 +0000
Subject: [PATCH 14/37] RE #27722 Remove reraise imported from six
---
qt/python/mantidqt/utils/qt/qappthreadcall.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/qt/python/mantidqt/utils/qt/qappthreadcall.py b/qt/python/mantidqt/utils/qt/qappthreadcall.py
index ffa370049b2..d08e02b9aec 100644
--- a/qt/python/mantidqt/utils/qt/qappthreadcall.py
+++ b/qt/python/mantidqt/utils/qt/qappthreadcall.py
@@ -13,8 +13,6 @@ import sys
from qtpy.QtCore import Qt, QMetaObject, QObject, QThread, Slot
from qtpy.QtWidgets import QApplication
-from six import reraise
-
class QAppThreadCall(QObject):
"""
@@ -51,7 +49,7 @@ class QAppThreadCall(QObject):
QMetaObject.invokeMethod(self, "on_call",
Qt.BlockingQueuedConnection)
if self._exc_info is not None:
- reraise(*self._exc_info)
+ raise self._exc_info[1].with_traceback(self._exc_info[2])
return self._result
@Slot()
--
GitLab
From f844a376ca1e5d9c0a84588cdc090aa4c6eac52c Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 14:43:01 +0000
Subject: [PATCH 15/37] RE #27722 Add unit tests for qappthreadcall
---
qt/python/mantidqt/utils/qt/test/__init__.py | 0
.../utils/qt/test/test_qappthreadcall.py | 49 +++++++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 qt/python/mantidqt/utils/qt/test/__init__.py
create mode 100644 qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
diff --git a/qt/python/mantidqt/utils/qt/test/__init__.py b/qt/python/mantidqt/utils/qt/test/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
new file mode 100644
index 00000000000..acd696dd833
--- /dev/null
+++ b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
@@ -0,0 +1,49 @@
+# Mantid Repository : https://github.com/mantidproject/mantid
+#
+# Copyright © 2020 ISIS Rutherford Appleton Laboratory UKRI,
+# NScD Oak Ridge National Laboratory, European Spallation Source
+# & Institut Laue - Langevin
+# SPDX - License - Identifier: GPL - 3.0 +
+# This file is part of the mantid workbench.
+#
+#
+import unittest
+
+from time import sleep
+
+from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
+from qtpy.QtWidgets import QApplication
+from mantidqt.utils.qt.testing import start_qapplication
+from mantidqt.utils.asynchronous import AsyncTask, TaskExitCode
+
+class CustomException(Exception):
+ pass
+
+@start_qapplication
+class QAppThreadCallTest(unittest.TestCase):
+ def test_correct_exception_is_raised_when_called_on_main_thread(self):
+ qappthread_wrap = QAppThreadCall(self.raises_exception)
+
+ self.assertRaises(CustomException, qappthread_wrap)
+
+ def test_correct_exception_is_raised_when_called_on_other_thread(self):
+ self.exc = None
+ self.exit_code = None
+
+ def collect_error(e):
+ self.exc = e
+
+ thread = AsyncTask(self.task, error_cb=collect_error)
+ thread.start()
+ while thread.is_alive():
+ QApplication.processEvents()
+ thread.join(0.5)
+ self.assertTrue(isinstance(self.exc.exc_value, CustomException))
+ self.assertEqual(TaskExitCode.ERROR, thread.exit_code)
+
+ def raises_exception(self):
+ raise CustomException()
+
+ def task(self):
+ qappthread_wrap = QAppThreadCall(self.raises_exception)
+ qappthread_wrap()
--
GitLab
From 7300a033e49bc648cd7e598dd2cd502ac98119b3 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 15:12:50 +0000
Subject: [PATCH 16/37] RE #27722 Remove misc six imports
---
Framework/PythonInterface/mantid/api/_workspaceops.py | 6 +++---
Framework/PythonInterface/plugins/algorithms/StringToPng.py | 3 +--
.../plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py | 2 --
.../WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py | 3 +--
scripts/SANS/SANSUtility.py | 2 +-
scripts/SANS/sans/command_interface/ISISCommandInterface.py | 3 +--
6 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/_workspaceops.py b/Framework/PythonInterface/mantid/api/_workspaceops.py
index d913536d0ad..ab1319e0608 100644
--- a/Framework/PythonInterface/mantid/api/_workspaceops.py
+++ b/Framework/PythonInterface/mantid/api/_workspaceops.py
@@ -15,7 +15,7 @@
import inspect as _inspect
import sys
-from six import Iterator, get_function_code
+from inspect import getsource
from mantid.api import AnalysisDataServiceImpl, ITableWorkspace, Workspace, WorkspaceGroup, performBinaryOp
from mantid.kernel.funcinspect import customise_func, lhs_info
@@ -203,7 +203,7 @@ def attach_tableworkspaceiterator():
"""Attaches the iterator code to a table workspace."""
def __iter_method(self):
- class ITableWorkspaceIter(Iterator):
+ class ITableWorkspaceIter(object):
def __init__(self, wksp):
self.__wksp = wksp
self.__pos = 0
@@ -253,7 +253,7 @@ def attach_func_as_method(name, func_obj, self_param_name, workspace_types=None)
signature = func_obj.__signature__.replace(parameters=func_parameters)
else:
signature = ['self']
- signature.extend(get_function_code(func_obj).co_varnames)
+ signature.extend(getsource(func_obj).co_varnames)
signature = tuple(signature)
customise_func(_method_impl, func_obj.__name__,
signature, func_obj.__doc__)
diff --git a/Framework/PythonInterface/plugins/algorithms/StringToPng.py b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
index 2a726daaad2..fabb831e5e8 100644
--- a/Framework/PythonInterface/plugins/algorithms/StringToPng.py
+++ b/Framework/PythonInterface/plugins/algorithms/StringToPng.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from six import u
import mantid
@@ -52,7 +51,7 @@ class StringToPng(mantid.api.PythonAlgorithm):
import matplotlib.pyplot as plt
fig=plt.figure(figsize=(.1,.1))
ax1=plt.axes(frameon=False)
- ax1.text(0.,1,bytearray(u(self.getProperty("String").valueAsStr), 'utf-8').decode('unicode_escape'),va="center",fontsize=16)
+ ax1.text(0.,1,bytearray(self.getProperty("String").valueAsStr, 'utf-8').decode('unicode_escape'),va="center",fontsize=16)
ax1.axes.get_xaxis().set_visible(False)
ax1.axes.get_yaxis().set_visible(False)
filename = self.getProperty("OutputFilename").value
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
index 4fc9d91cafc..202bb4d404a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/BayesQuasi.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,too-many-instance-attributes,too-many-branches,no-init,redefined-builtin
-from six.moves import range
-from six import next
import os
import numpy as np
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
index e2e7a0c9a71..406d8a7c04f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/FlatPlatePaalmanPingsCorrection.py
@@ -7,7 +7,6 @@
# pylint: disable=no-init,invalid-name,too-many-instance-attributes
import math
-from six import integer_types
import numpy as np
from mantid.simpleapi import *
@@ -546,7 +545,7 @@ class FlatPlatePaalmanPingsCorrection(PythonAlgorithm):
for key, value in sample_logs.items():
if isinstance(value, bool):
log_type = 'String'
- elif isinstance(value, (integer_types, float)):
+ elif isinstance(value, (int, float)):
log_type = 'Number'
else:
log_type = 'String'
diff --git a/scripts/SANS/SANSUtility.py b/scripts/SANS/SANSUtility.py
index 0215dcafafe..f74495fec95 100644
--- a/scripts/SANS/SANSUtility.py
+++ b/scripts/SANS/SANSUtility.py
@@ -17,7 +17,7 @@ import inspect
import math
import os
import re
-from six import types
+import types
import numpy as np
import h5py as h5
diff --git a/scripts/SANS/sans/command_interface/ISISCommandInterface.py b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
index 5c58c7705e1..b4648c8091c 100644
--- a/scripts/SANS/sans/command_interface/ISISCommandInterface.py
+++ b/scripts/SANS/sans/command_interface/ISISCommandInterface.py
@@ -8,8 +8,7 @@ import inspect
import os
import re
-import six
-from six import types
+import types
from SANSadd2 import add_runs
from mantid.api import (AnalysisDataService, WorkspaceGroup)
--
GitLab
From 9240f8f948dc042ae305773a0c11bdbe2fb6cd27 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 15:30:41 +0000
Subject: [PATCH 17/37] RE #27722 Remove six.moves imports
---
Framework/Doxygen/make_header.py | 1 -
.../plugins/algorithms/CollectHB3AExperimentInfo.py | 1 -
.../PythonInterface/plugins/algorithms/CreateLeBailFitInput.py | 2 --
.../plugins/algorithms/ExaminePowderDiffProfile.py | 2 --
.../PythonInterface/plugins/algorithms/ExportExperimentLog.py | 2 --
.../plugins/algorithms/ExportSampleLogsToCSVFile.py | 3 ---
.../PythonInterface/plugins/algorithms/LoadFullprofFile.py | 2 --
.../plugins/algorithms/RefinePowderDiffProfileSeq.py | 2 --
.../PythonInterface/plugins/algorithms/RetrieveRunInfo.py | 3 +--
.../PythonInterface/plugins/algorithms/SNSPowderReduction.py | 2 --
Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py | 2 --
.../plugins/algorithms/UpdatePeakParameterTableValue.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/LoadWAND.py | 1 -
.../plugins/algorithms/WorkflowAlgorithms/MSDFit.py | 3 ---
.../plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py | 2 --
.../plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py | 1 -
.../algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py | 2 --
.../test/python/mantid/api/MatrixWorkspaceTest.py | 3 ---
.../test/python/plugins/algorithms/CreateLeBailFitInputTest.py | 1 -
.../test/python/plugins/algorithms/ExportExperimentLogTest.py | 2 --
.../python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py | 3 ---
.../test/python/plugins/algorithms/ExportSpectraMaskTest.py | 2 --
.../test/python/plugins/algorithms/SymmetriseTest.py | 2 --
.../WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py | 3 ---
.../plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py | 2 --
.../test/python/plugins/functions/EISFDiffCylinderTest.py | 2 --
MantidPlot/pymantidplot/__init__.py | 2 --
MantidPlot/pymantidplot/proxies.py | 3 ---
Testing/PerformanceTests/analysis_mpl.py | 2 --
Testing/PerformanceTests/sqlresults.py | 1 -
Testing/SystemTests/scripts/performance/analysis.py | 1 -
Testing/SystemTests/scripts/performance/sqlresults.py | 1 -
Testing/SystemTests/tests/analysis/CodeConventions.py | 1 -
Testing/SystemTests/tests/analysis/MDWorkspaceTests.py | 2 --
docs/sphinxext/mantiddoc/directives/properties.py | 2 --
scripts/HFIR_4Circle_Reduction/NTableWidget.py | 1 -
scripts/HFIR_4Circle_Reduction/absorption.py | 2 --
scripts/HFIR_4Circle_Reduction/fourcircle_utility.py | 1 -
scripts/HFIR_4Circle_Reduction/guiutility.py | 1 -
scripts/HFIR_4Circle_Reduction/hfctables.py | 1 -
scripts/HFIR_4Circle_Reduction/message_dialog.py | 1 -
scripts/HFIR_4Circle_Reduction/mplgraphicsview.py | 1 -
scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py | 1 -
scripts/HFIR_4Circle_Reduction/peak_integration_utility.py | 1 -
scripts/HFIR_4Circle_Reduction/peakprocesshelper.py | 1 -
scripts/HFIR_4Circle_Reduction/plot3dwindow.py | 1 -
scripts/HFIR_4Circle_Reduction/reduce4circleControl.py | 1 -
scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py | 1 -
scripts/Inelastic/Direct/DirectEnergyConversion.py | 2 --
scripts/Inelastic/Direct/ReductionHelpers.py | 2 --
scripts/Inelastic/IndirectCommon.py | 2 --
scripts/Inelastic/dos/load_castep.py | 2 --
scripts/Inelastic/dos/load_phonon.py | 2 --
scripts/test/DirectPropertyManater_OldInterfaceXest.py | 1 -
tools/PeriodicTable/generate_atom_code.py | 1 -
55 files changed, 1 insertion(+), 93 deletions(-)
diff --git a/Framework/Doxygen/make_header.py b/Framework/Doxygen/make_header.py
index 232c5ce99af..c87976c431e 100644
--- a/Framework/Doxygen/make_header.py
+++ b/Framework/Doxygen/make_header.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six.moves import range #pylint: disable=redefined-builtin
import sys
tracking = """<script>
diff --git a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
index dc8648cbf70..ab73e17241b 100644
--- a/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py
@@ -9,7 +9,6 @@ import mantid
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range #pylint: disable=redefined-builtin
import os
diff --git a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
index a5b60f8579f..53ae6c91217 100644
--- a/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
+++ b/Framework/PythonInterface/plugins/algorithms/CreateLeBailFitInput.py
@@ -8,8 +8,6 @@
import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range #pylint: disable=redefined-builtin
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
index 0bcae966cdd..68c15ddb8cd 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExaminePowderDiffProfile.py
@@ -9,8 +9,6 @@ import mantid.simpleapi as api
from mantid.api import *
from mantid.kernel import *
-from six.moves import range
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
index 220a94c6bc8..ab7d7283c7d 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportExperimentLog.py
@@ -11,8 +11,6 @@ from mantid.kernel import *
import datetime
import time
import os
-from six.moves import range
-
#pylint: disable=too-many-instance-attributes
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
index 429c6abfc28..5210878677f 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
@@ -10,9 +10,6 @@ from mantid.kernel import *
from distutils.version import LooseVersion
import numpy as np
import os
-from six.moves import range # pylint: disable=redefined-builtin
-
-
class ExportSampleLogsToCSVFile(PythonAlgorithm):
""" Python algorithm to export sample logs to spread sheet file
for VULCAN
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
index 60be827d095..57831f78a46 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadFullprofFile.py
@@ -8,8 +8,6 @@
from mantid.api import PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty, WorkspaceFactory,\
FileProperty, FileAction, MatrixWorkspaceProperty
from mantid.kernel import Direction
-from six.moves import range #pylint: disable=redefined-builtin
-
_OUTPUTLEVEL = "NOOUTPUT"
diff --git a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
index 02f4013389e..9a73e3b29ba 100644
--- a/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
+++ b/Framework/PythonInterface/plugins/algorithms/RefinePowderDiffProfileSeq.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from six.moves import range #pylint: disable=redefined-builtin
-
from mantid.api import *
import mantid.simpleapi as api
from mantid.kernel import *
diff --git a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
index 25dc24e9f98..ec351ef7a70 100644
--- a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
@@ -10,8 +10,7 @@ from mantid.simpleapi import *
from mantid.kernel import StringMandatoryValidator, Direction
from mantid import config
import os
-from six.moves import filterfalse
-
+from itertools import filterfalse
class Intervals(object):
# Having "*intervals" as a parameter instead of "intervals" allows us
diff --git a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
index 0801a0af7be..ec73d3dbd4a 100644
--- a/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -15,8 +15,6 @@ from mantid.api import mtd, AlgorithmFactory, AnalysisDataService, DistributedDa
from mantid.kernel import ConfigService, Direction, FloatArrayProperty, FloatBoundedValidator, \
IntArrayBoundedValidator, IntArrayProperty, Property, PropertyManagerDataService, StringListValidator
from mantid.dataobjects import SplittersWorkspace # SplittersWorkspace
-from six.moves import range #pylint: disable=redefined-builtin
-
if AlgorithmFactory.exists('GatherWorkspaces'):
HAVE_MPI = True
from mpi4py import MPI
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
index 05ea1460963..77e0cd80080 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveNexusPD.py
@@ -9,8 +9,6 @@ import numpy as np
import mantid
import mantid.simpleapi as api
from mantid.kernel import StringListValidator
-from six.moves import range #pylint: disable=redefined-builtin
-
try:
import h5py # http://www.h5py.org/
except ImportError:
diff --git a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
index 5b70ea7c7c1..712b49f5aae 100644
--- a/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
+++ b/Framework/PythonInterface/plugins/algorithms/UpdatePeakParameterTableValue.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from six.moves import range
-
import mantid
import mantid.api
import mantid.kernel
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
index d8f84413e89..ec051e4bd68 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/LoadWAND.py
@@ -8,7 +8,6 @@ from mantid.api import DataProcessorAlgorithm, AlgorithmFactory, MultipleFilePro
from mantid.kernel import Direction, UnitConversion, Elastic, Property, IntArrayProperty, StringListValidator
from mantid.simpleapi import (mtd, SetGoniometer, AddSampleLog, MaskBTP, RenameWorkspace, GroupWorkspaces,
CreateWorkspace, LoadNexusLogs, LoadInstrument)
-from six.moves import range
import numpy as np
import h5py
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
index 8faa69ec225..c6ba2c2771a 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
@@ -8,9 +8,6 @@
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
-from six.moves import range # pylint: disable=redefined-builti
-
-
class MSDFit(DataProcessorAlgorithm):
_output_fit_ws = None
_model = None
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
index cd9261fed4c..5991a861ea3 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,redefined-builtin
-from six.moves import range
-
import mantid
from mantid.kernel import Direction, IntArrayProperty, StringArrayProperty, StringListValidator
import sys
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
index d92866716f4..e69393c63de 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSS.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-from six.moves import range #pylint: disable=redefined-builtin
import mantid.simpleapi as api
from mantid.api import AnalysisDataService
from mantid.api import MatrixWorkspaceProperty, PropertyMode, PythonAlgorithm, AlgorithmFactory, ITableWorkspaceProperty
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
index 531f2d551fc..1edc446ec7d 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,too-many-locals,too-many-lines, redefined-builtin
-from six.moves import range
-
import numpy as np
import re
import os.path
diff --git a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
index a060e365b86..20ca8badeaa 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
@@ -14,9 +14,6 @@ from mantid.geometry import Detector
from mantid.kernel import Direction, V3D
from mantid.simpleapi import CreateSampleWorkspace, Rebin
import numpy as np
-from six.moves import range
-
-
class MatrixWorkspaceTest(unittest.TestCase):
_test_ws_prop = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
index a8d77cfdd7d..9fe2d47b92f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
@@ -10,7 +10,6 @@ from mantid.kernel import *
from mantid.api import *
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
-from six.moves import range
import os
class CreateLeBailFitInputTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index f25e7924812..60d429cb5e1 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -13,8 +13,6 @@ import mantid.kernel as kernel
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
-from six.moves import range
-
class ExportExperimentLogTest(unittest.TestCase):
def test_exportFileNew(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
index 7d8632f3c1c..42e9b13c607 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
@@ -11,9 +11,6 @@ from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
from distutils.version import LooseVersion
-from six.moves import range
-
-
class ExportVulcanSampleLogTest(unittest.TestCase):
def test_exportFileOnly(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
index 7e72623d9ad..b0f6b84b84f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
@@ -10,8 +10,6 @@ import numpy as np
import unittest
import mantid
from mantid.simpleapi import ExportSpectraMask,DeleteWorkspace
-from six.moves import range
-
class ExportSpectraMaskTest(unittest.TestCase):
def __init__(self,method_name):
unittest.TestCase.__init__(self,method_name)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
index 0ff3d3c13d7..04ce1c5dcad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SymmetriseTest.py
@@ -8,8 +8,6 @@
import numpy as np
import unittest
-from six.moves import range
-
from mantid.api import *
from mantid.simpleapi import CreateWorkspace, ScaleX, Symmetrise
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
index 87713bfb104..94c34e678aa 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
@@ -12,9 +12,6 @@ from testhelpers import run_algorithm
import numpy as np
from SANSDarkRunBackgroundCorrection import DarkRunMonitorAndDetectorRemover
from SANSDarkRunBackgroundCorrection import SANSDarkRunBackgroundCorrection
-from six.moves import range
-
-
class SANSDarkRunBackgroundCorrectionTest(unittest.TestCase):
#-----
# Workspace2D tests
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
index 4b1138cf44b..0507536309a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SaveVulcanGSSTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six.moves import range
-
import unittest
import math
import numpy
diff --git a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
index cd9984a417a..152ba9d4d1c 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/EISFDiffCylinderTest.py
@@ -6,8 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
import numpy as np
-from six.moves import zip
-
from MsdTestHelper import (is_registered, check_output, do_a_fit)
diff --git a/MantidPlot/pymantidplot/__init__.py b/MantidPlot/pymantidplot/__init__.py
index ead9c968583..f9bc371ea25 100644
--- a/MantidPlot/pymantidplot/__init__.py
+++ b/MantidPlot/pymantidplot/__init__.py
@@ -33,8 +33,6 @@ import mantidqtpython
from mantidqtpython import GraphOptions # noqa
# historical names in MantidPlot
from mantidqtpython import MantidQt as _MantidQt
-from six.moves import range
-
# (a) don't need a proxy & (b) can be constructed from python or (c) have enumerations within them
from _qti import (PlotSymbol, ImageSymbol, ArrowMarker, ImageMarker, InstrumentView) # noqa
diff --git a/MantidPlot/pymantidplot/proxies.py b/MantidPlot/pymantidplot/proxies.py
index 3a3143b71cc..8552602c76b 100644
--- a/MantidPlot/pymantidplot/proxies.py
+++ b/MantidPlot/pymantidplot/proxies.py
@@ -9,9 +9,6 @@ Module containing classes that act as proxies to the various MantidPlot gui obje
accessible from python. They listen for the QObject 'destroyed' signal and set the wrapped
reference to None, thus ensuring that further attempts at access do not cause a crash.
"""
-
-from six.moves import range
-
from PyQt4 import QtCore, QtGui
from PyQt4.QtCore import Qt, pyqtSlot
try:
diff --git a/Testing/PerformanceTests/analysis_mpl.py b/Testing/PerformanceTests/analysis_mpl.py
index b9716eacb5f..1d26bcff1a9 100644
--- a/Testing/PerformanceTests/analysis_mpl.py
+++ b/Testing/PerformanceTests/analysis_mpl.py
@@ -12,8 +12,6 @@ import os
import numpy as np
from pylab import close, figure, gcf, plot, xticks, ylabel, xlabel, title, savefig
-from six.moves import range
-
import sqlresults
from sqlresults import get_results
diff --git a/Testing/PerformanceTests/sqlresults.py b/Testing/PerformanceTests/sqlresults.py
index 37c8996c10f..d060abe9fa9 100644
--- a/Testing/PerformanceTests/sqlresults.py
+++ b/Testing/PerformanceTests/sqlresults.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six.moves import range
try:
import sqlite3
has_sql = True
diff --git a/Testing/SystemTests/scripts/performance/analysis.py b/Testing/SystemTests/scripts/performance/analysis.py
index ef585344558..de321f10a2f 100644
--- a/Testing/SystemTests/scripts/performance/analysis.py
+++ b/Testing/SystemTests/scripts/performance/analysis.py
@@ -7,7 +7,6 @@
""" Module containing functions for test
performance analysis, plotting, and saving
to other formats (CSV, PDF) """
-from six.moves import range
import testresult
import os
import sys
diff --git a/Testing/SystemTests/scripts/performance/sqlresults.py b/Testing/SystemTests/scripts/performance/sqlresults.py
index 8ca422ff12a..c5142d6e2a2 100644
--- a/Testing/SystemTests/scripts/performance/sqlresults.py
+++ b/Testing/SystemTests/scripts/performance/sqlresults.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six.moves import range
try:
import sqlite3
has_sql = True
diff --git a/Testing/SystemTests/tests/analysis/CodeConventions.py b/Testing/SystemTests/tests/analysis/CodeConventions.py
index fa0c88c8c9e..fec9d63d6bc 100644
--- a/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -9,7 +9,6 @@ import systemtesting
import re
import mantid
from mantid.simpleapi import *
-from six.moves import range
MAX_ALG_LEN = 40 # TODO convention says 20 is the maximum
SPECIAL = ["InputWorkspace", "OutputWorkspace", "Workspace",
diff --git a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
index 566534b14da..63c930e0d20 100644
--- a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
+++ b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
@@ -15,8 +15,6 @@ import os
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
-from six.moves import range
-
###############################################################################
diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py
index 7abde84b9f3..29c782cc234 100644
--- a/docs/sphinxext/mantiddoc/directives/properties.py
+++ b/docs/sphinxext/mantiddoc/directives/properties.py
@@ -8,8 +8,6 @@
from mantiddoc.directives.base import AlgorithmBaseDirective #pylint: disable=unused-import
import re
from string import punctuation
-from six.moves import range
-
SUBSTITUTE_REF_RE = re.compile(r'\|(.+?)\|')
class PropertiesDirective(AlgorithmBaseDirective):
diff --git a/scripts/HFIR_4Circle_Reduction/NTableWidget.py b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
index 07dfe83d330..74598a992da 100644
--- a/scripts/HFIR_4Circle_Reduction/NTableWidget.py
+++ b/scripts/HFIR_4Circle_Reduction/NTableWidget.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,R0904
# N(DAV)TableWidget
-from six.moves import range
import csv
from qtpy.QtWidgets import (QCheckBox, QTableWidget, QTableWidgetItem) # noqa
from qtpy import QtCore # noqa
diff --git a/scripts/HFIR_4Circle_Reduction/absorption.py b/scripts/HFIR_4Circle_Reduction/absorption.py
index 09a03bdec65..255b850ab1b 100644
--- a/scripts/HFIR_4Circle_Reduction/absorption.py
+++ b/scripts/HFIR_4Circle_Reduction/absorption.py
@@ -10,8 +10,6 @@ import math
from mantid.api import AnalysisDataService
import numpy
import numpy.linalg
-from six.moves import range
-
# This module does absorption correction
diff --git a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
index 338227d91e1..5678816a1f2 100644
--- a/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/fourcircle_utility.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0633,R0913,too-many-branches
-from six.moves import range
import csv
import os
try:
diff --git a/scripts/HFIR_4Circle_Reduction/guiutility.py b/scripts/HFIR_4Circle_Reduction/guiutility.py
index 4839b37da8d..33686806dc6 100644
--- a/scripts/HFIR_4Circle_Reduction/guiutility.py
+++ b/scripts/HFIR_4Circle_Reduction/guiutility.py
@@ -7,7 +7,6 @@
#
# GUI Utility Methods
#
-from six.moves import range
import math
import numpy
import os
diff --git a/scripts/HFIR_4Circle_Reduction/hfctables.py b/scripts/HFIR_4Circle_Reduction/hfctables.py
index d34833f29a6..1c9a4e3c7b1 100644
--- a/scripts/HFIR_4Circle_Reduction/hfctables.py
+++ b/scripts/HFIR_4Circle_Reduction/hfctables.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,C0103,R0901,R0904,R0913,C0302
-from six.moves import range
import numpy
import sys
from HFIR_4Circle_Reduction import fourcircle_utility
diff --git a/scripts/HFIR_4Circle_Reduction/message_dialog.py b/scripts/HFIR_4Circle_Reduction/message_dialog.py
index 2dc0f02ffcd..dc3cee74144 100644
--- a/scripts/HFIR_4Circle_Reduction/message_dialog.py
+++ b/scripts/HFIR_4Circle_Reduction/message_dialog.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Dialog for message
-from six.moves import range
from qtpy.QtWidgets import (QDialog) # noqa
from mantid.kernel import Logger
try:
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
index 351744e14df..3492b1335ed 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,too-many-public-methods,too-many-arguments,non-parent-init-called,R0902,too-many-branches,C0302
-from six.moves import range
import os
import numpy as np
from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
index cbeb6f4fe9e..b4fd4e22a0e 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=R0901,R0902,R0904
-from six.moves import range
import numpy as np
import os
diff --git a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
index 346bcd63861..c5011c6af8f 100644
--- a/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
+++ b/scripts/HFIR_4Circle_Reduction/peak_integration_utility.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# Utility methods to do peak integration
-from six.moves import range
import numpy
import math
import os
diff --git a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
index fa9ef655932..dc6ad63d5fd 100644
--- a/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
+++ b/scripts/HFIR_4Circle_Reduction/peakprocesshelper.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0403,R0902
-from six.moves import range
import numpy
import time
import random
diff --git a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
index 217c97d07b0..8de6d26cb81 100644
--- a/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
+++ b/scripts/HFIR_4Circle_Reduction/plot3dwindow.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=C0103,W0403
-from six.moves import range
import sys
import numpy as np
from qtpy.QtWidgets import (QMainWindow)
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
index 4e5f547686e..556fa85b022 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleControl.py
@@ -24,7 +24,6 @@ except ImportError:
from urllib2 import urlopen
from urllib2 import HTTPError
from urllib2 import URLError
-from six.moves import range
import math
import csv
import random
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
index c3929ebdd98..c77017a18bd 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
@@ -10,7 +10,6 @@
# MainWindow application for reducing HFIR 4-circle
#
################################################################################
-from six.moves import range
import six
import os
import sys
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 4de8c4fccae..56abf1de7b1 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -17,8 +17,6 @@ import math
import time
import numpy as np
import collections
-from six.moves import range
-
import Direct.CommonFunctions as common
import Direct.diagnostics as diagnostics
from Direct.PropertyManager import PropertyManager
diff --git a/scripts/Inelastic/Direct/ReductionHelpers.py b/scripts/Inelastic/Direct/ReductionHelpers.py
index a4dd4c7ac25..ce40e02416a 100644
--- a/scripts/Inelastic/Direct/ReductionHelpers.py
+++ b/scripts/Inelastic/Direct/ReductionHelpers.py
@@ -8,8 +8,6 @@
from mantid import config
import os
import re
-from six.moves import range
-
"""
Set of functions to assist with processing instrument parameters relevant to reduction.
"""
diff --git a/scripts/Inelastic/IndirectCommon.py b/scripts/Inelastic/IndirectCommon.py
index 8f680f9a46b..5e3a53baee2 100644
--- a/scripts/Inelastic/IndirectCommon.py
+++ b/scripts/Inelastic/IndirectCommon.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,redefined-builtin
-from six.moves import range
-
import mantid.simpleapi as s_api
from mantid import config, logger
diff --git a/scripts/Inelastic/dos/load_castep.py b/scripts/Inelastic/dos/load_castep.py
index 6b147775b13..415dce5595c 100644
--- a/scripts/Inelastic/dos/load_castep.py
+++ b/scripts/Inelastic/dos/load_castep.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from six.moves import range
-
import re
import numpy as np
diff --git a/scripts/Inelastic/dos/load_phonon.py b/scripts/Inelastic/dos/load_phonon.py
index 5d461330728..f9b61a961e5 100644
--- a/scripts/Inelastic/dos/load_phonon.py
+++ b/scripts/Inelastic/dos/load_phonon.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=redefined-builtin
-from six.moves import range
-
import re
import numpy as np
diff --git a/scripts/test/DirectPropertyManater_OldInterfaceXest.py b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
index 0e3f5ba7941..4228a26614a 100644
--- a/scripts/test/DirectPropertyManater_OldInterfaceXest.py
+++ b/scripts/test/DirectPropertyManater_OldInterfaceXest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from six.moves import range
from mantid.simpleapi import *
import unittest
from DirectEnergyConversion import DirectEnergyConversion
diff --git a/tools/PeriodicTable/generate_atom_code.py b/tools/PeriodicTable/generate_atom_code.py
index d6b0218b3b6..62f442d8587 100755
--- a/tools/PeriodicTable/generate_atom_code.py
+++ b/tools/PeriodicTable/generate_atom_code.py
@@ -6,7 +6,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-from six.moves import range
import optparse
import sys
try:
--
GitLab
From 051c5a0161e32ba866e457e7a707b3f26b6c32e5 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 16:14:13 +0000
Subject: [PATCH 18/37] RE #27722 Replace imports of mantid.py3compat.enum
---
Framework/PythonInterface/mantid/py3compat/__init__.py | 2 +-
.../plugins/algorithms/BASISCrystalDiffraction.py | 2 +-
.../plugins/algorithms/BASISPowderDiffraction.py | 2 +-
Framework/PythonInterface/plugins/algorithms/SaveReflections.py | 2 +-
.../workbench/workbench/widgets/plotselector/view.py | 2 +-
qt/python/mantidqt/utils/asynchronous.py | 2 +-
qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py | 2 +-
qt/python/mantidqt/widgets/sliceviewer/model.py | 2 +-
scripts/Interface/ui/sans_isis/sans_data_processor_gui.py | 2 +-
scripts/SANS/sans/algorithm_detail/mask_functions.py | 2 +-
.../sans/algorithm_detail/move_sans_instrument_component.py | 2 +-
.../sans/command_interface/command_interface_state_director.py | 2 +-
scripts/SANS/sans/common/enums.py | 2 +-
scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py | 2 +-
scripts/SANS/sans/user_file/settings_tags.py | 2 +-
scripts/test/SANS/state/JsonSerializerTest.py | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index 09fe0ac920b..cc064739466 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -30,7 +30,7 @@ try:
from enum import Enum
except ImportError:
# use a compatability layer
- from mantid.py3compat.enum import Enum # noqa
+ from enum import Enum # noqa
# -----------------------------------------------------------------------------
# Globals and constants
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
index f316a03fc28..90291525cd1 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISCrystalDiffraction.py
@@ -12,7 +12,7 @@ from collections import namedtuple
from contextlib import contextmanager
import numpy as np
-from mantid.py3compat.enum import Enum
+from enum import Enum
from mantid import config as mantid_config
from mantid.api import (DataProcessorAlgorithm, AlgorithmFactory, FileProperty,
WorkspaceProperty, FileAction, PropertyMode, mtd,
diff --git a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
index cb57a5ec9d9..90e7185da75 100644
--- a/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
+++ b/Framework/PythonInterface/plugins/algorithms/BASISPowderDiffraction.py
@@ -11,7 +11,7 @@ import numpy as np
from collections import namedtuple
from contextlib import contextmanager
-from mantid.py3compat.enum import Enum
+from enum import Enum
from mantid import config as mantid_config
from mantid.api import (AnalysisDataService, DataProcessorAlgorithm,
AlgorithmFactory, FileProperty, FileAction,
diff --git a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
index 07c9abdbc2e..a2311f7d642 100644
--- a/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
+++ b/Framework/PythonInterface/plugins/algorithms/SaveReflections.py
@@ -8,7 +8,7 @@ import os.path as osp
import numpy as np
from mantid.api import (AlgorithmFactory, FileProperty, FileAction, IPeaksWorkspaceProperty, PythonAlgorithm)
from mantid.kernel import StringListValidator, Direction
-from mantid.py3compat.enum import Enum
+from enum import Enum
def num_modulation_vectors(workspace):
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/view.py b/qt/applications/workbench/workbench/widgets/plotselector/view.py
index e909f3022af..667bb57155c 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/view.py
@@ -12,7 +12,7 @@ from qtpy.QtCore import Qt, Signal, QMutex, QMutexLocker
from qtpy.QtWidgets import (QAbstractItemView, QAction, QActionGroup, QFileDialog, QHBoxLayout, QHeaderView, QLineEdit,
QMenu, QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget)
-from mantid.py3compat.enum import IntEnum
+from enum import IntEnum
from mantidqt.icons import get_icon
from mantidqt.utils.flowlayout import FlowLayout
diff --git a/qt/python/mantidqt/utils/asynchronous.py b/qt/python/mantidqt/utils/asynchronous.py
index 84184d46640..bdaa790b1ad 100644
--- a/qt/python/mantidqt/utils/asynchronous.py
+++ b/qt/python/mantidqt/utils/asynchronous.py
@@ -14,7 +14,7 @@ import threading
import time
from traceback import extract_tb
-from mantid.py3compat.enum import Enum
+from enum import Enum
class TaskExitCode(Enum):
diff --git a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
index d1c90eacb4d..d0fa58871a0 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/dimensionwidget.py
@@ -9,7 +9,7 @@
#
from qtpy.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QLabel, QPushButton, QSlider, QDoubleSpinBox, QSpinBox
from qtpy.QtCore import Qt, Signal
-from mantid.py3compat.enum import Enum
+from enum import Enum
class State(Enum):
diff --git a/qt/python/mantidqt/widgets/sliceviewer/model.py b/qt/python/mantidqt/widgets/sliceviewer/model.py
index 4d33e182a36..cb94985dcc2 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/model.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/model.py
@@ -10,7 +10,7 @@
from mantid.plots.datafunctions import get_indices
from mantid.api import MatrixWorkspace, MultipleExperimentInfos
from mantid.simpleapi import BinMD
-from mantid.py3compat.enum import Enum
+from enum import Enum
import numpy as np
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index 74227738b4e..cc002a04f16 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -14,7 +14,7 @@ from qtpy.QtCore import QRegExp
from qtpy.QtGui import (QDoubleValidator, QIntValidator, QRegExpValidator)
from qtpy.QtWidgets import (QListWidgetItem, QMessageBox, QFileDialog, QMainWindow)
from mantid.kernel import (Logger, UsageService, FeatureType)
-from mantid.py3compat import Enum
+from enum import Enum
from mantidqt import icons
from mantidqt.interfacemanager import InterfaceManager
from mantidqt.utils.qt import load_ui
diff --git a/scripts/SANS/sans/algorithm_detail/mask_functions.py b/scripts/SANS/sans/algorithm_detail/mask_functions.py
index 1a5220bdf12..f0715a63210 100644
--- a/scripts/SANS/sans/algorithm_detail/mask_functions.py
+++ b/scripts/SANS/sans/algorithm_detail/mask_functions.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from collections import (namedtuple, Sequence)
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import (DetectorType, SANSInstrument)
from sans.common.xml_parsing import get_named_elements_from_ipf_file
diff --git a/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py b/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
index 43e7a7ebece..b7aa21006b0 100644
--- a/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
+++ b/scripts/SANS/sans/algorithm_detail/move_sans_instrument_component.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from mantid.py3compat.enum import Enum
+from enum import Enum
from sans.algorithm_detail.move_workspaces import create_mover
from sans.common.enums import DetectorType
diff --git a/scripts/SANS/sans/command_interface/command_interface_state_director.py b/scripts/SANS/sans/command_interface/command_interface_state_director.py
index e3ed619390d..95009f51496 100644
--- a/scripts/SANS/sans/command_interface/command_interface_state_director.py
+++ b/scripts/SANS/sans/command_interface/command_interface_state_director.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import DataType
from sans.common.file_information import SANSFileInformationFactory
from sans.state.StateRunDataBuilder import StateRunDataBuilder
diff --git a/scripts/SANS/sans/common/enums.py b/scripts/SANS/sans/common/enums.py
index 3778638b6e7..00fd44bc7a3 100644
--- a/scripts/SANS/sans/common/enums.py
+++ b/scripts/SANS/sans/common/enums.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
""" The elements of this module define typed enums which are used in the SANS reduction framework."""
-from mantid.py3compat import Enum
+from enum import Enum
from sans.state.JsonSerializable import json_serializable
diff --git a/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py b/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
index 28f82e19e11..2f457a54b4d 100644
--- a/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
+++ b/scripts/SANS/sans/gui_logic/presenter/add_runs_presenter.py
@@ -7,7 +7,7 @@
import os
from mantid.kernel import ConfigService
-from mantid.py3compat import Enum
+from enum import Enum
from sans.common.enums import BinningType
from sans.common.file_information import SANSFileInformationFactory
from sans.gui_logic.gui_common import SANSGuiPropertiesHandler
diff --git a/scripts/SANS/sans/user_file/settings_tags.py b/scripts/SANS/sans/user_file/settings_tags.py
index c7ef0d5fd28..ac0f3795f00 100644
--- a/scripts/SANS/sans/user_file/settings_tags.py
+++ b/scripts/SANS/sans/user_file/settings_tags.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from collections import namedtuple
-from mantid.py3compat import Enum
+from enum import Enum
# ----------------------------------------------------------------------------------------------------------------------
# Named tuples for passing around data in a structured way, a bit like a plain old c-struct.
diff --git a/scripts/test/SANS/state/JsonSerializerTest.py b/scripts/test/SANS/state/JsonSerializerTest.py
index 139795615bb..1cc5803ecc7 100644
--- a/scripts/test/SANS/state/JsonSerializerTest.py
+++ b/scripts/test/SANS/state/JsonSerializerTest.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import Algorithm
-from mantid.py3compat import Enum
+from enum import Enum
# ----------------------------------------------------------------------------------------------------------------------
--
GitLab
From 7fa823ee6612601c21e249b2718386bdfc922a10 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 16:42:09 +0000
Subject: [PATCH 19/37] RE #27722 Remove misc references to mantid.py3compat
---
.../PythonInterface/mantid/plots/plotfunctions.py | 3 +--
MantidPlot/ipython_widget/mantid_ipython_widget.py | 2 +-
qt/applications/workbench/workbench/app/mainwindow.py | 2 +-
qt/applications/workbench/workbench/config/user.py | 11 ++++-------
.../workbench/workbench/plotting/figuremanager.py | 3 +--
.../workbench/plotting/plotscriptgenerator/utils.py | 4 +---
.../widgets/codeeditor/test/test_execution.py | 3 ++-
qt/python/mantidqt/widgets/jupyterconsole.py | 2 +-
.../SANS/sans/command_interface/batch_csv_parser.py | 3 +--
scripts/SANS/sans/gui_logic/models/state_gui_model.py | 3 +--
.../command_interface/batch_csv_file_parser_test.py | 6 ++----
11 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index ac641f67f42..4138bc24bf0 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -18,7 +18,6 @@ from matplotlib.legend import Legend
from mantid.api import AnalysisDataService, MatrixWorkspace
from mantid.kernel import ConfigService
from mantid.plots import datafunctions, MantidAxes
-from mantid.py3compat import is_text_string
# -----------------------------------------------------------------------------
# Constants
@@ -73,7 +72,7 @@ def figure_title(workspaces, fig_num):
def wsname(w):
return w.name() if hasattr(w, 'name') else w
- if is_text_string(workspaces) or not isinstance(workspaces, collections.Sequence):
+ if isinstance(workspaces, str) or not isinstance(workspaces, collections.Sequence):
# assume a single workspace
first = workspaces
else:
diff --git a/MantidPlot/ipython_widget/mantid_ipython_widget.py b/MantidPlot/ipython_widget/mantid_ipython_widget.py
index 7b7203957e3..ef29c7659c8 100644
--- a/MantidPlot/ipython_widget/mantid_ipython_widget.py
+++ b/MantidPlot/ipython_widget/mantid_ipython_widget.py
@@ -10,7 +10,7 @@ import sys
import threading
import types
import warnings
-from mantid.py3compat import getfullargspec
+from inspect import getfullargspec
from PyQt4 import QtGui
# IPython monkey patches the pygments.lexer.RegexLexer.get_tokens_unprocessed method
diff --git a/qt/applications/workbench/workbench/app/mainwindow.py b/qt/applications/workbench/workbench/app/mainwindow.py
index 5ee63b31454..c856a544d2c 100644
--- a/qt/applications/workbench/workbench/app/mainwindow.py
+++ b/qt/applications/workbench/workbench/app/mainwindow.py
@@ -19,7 +19,7 @@ from functools import partial
from mantid.api import FrameworkManagerImpl
from mantid.kernel import (ConfigService, UsageService, logger, version_str as mantid_version_str)
-from mantid.py3compat import setswitchinterval
+from sys import setswitchinterval
from mantid.utils import is_required_version
from workbench.app import MAIN_WINDOW_OBJECT_NAME, MAIN_WINDOW_TITLE
from workbench.plugins.exception_handler import exception_logger
diff --git a/qt/applications/workbench/workbench/config/user.py b/qt/applications/workbench/workbench/config/user.py
index fb951e22ba6..daa70465b1e 100644
--- a/qt/applications/workbench/workbench/config/user.py
+++ b/qt/applications/workbench/workbench/config/user.py
@@ -7,9 +7,6 @@
# This file is part of the mantid workbench.
#
#
-
-
-from mantid.py3compat import is_text_string
from posixpath import join as joinsettings
from qtpy.QtCore import QSettings
@@ -157,13 +154,13 @@ class UserConfig(object):
Sanity check the section and option are strings and return the flattened option key
"""
if second is None:
- if not is_text_string(option):
+ if not isinstance(option, str):
raise TypeError('Found invalid type ({}) for option ({}) must be a string'.format(type(option), option))
return option
- else: # fist argument is actually the section/group
- if not is_text_string(option):
+ else: # first argument is actually the section/group
+ if not isinstance(option, str):
raise TypeError(
'Found invalid type ({}) for section ({}) must be a string'.format(type(option), option))
- if not is_text_string(second):
+ if not isinstance(second, str):
raise TypeError('Found invalid type ({}) for option ({}) must be a string'.format(type(second), second))
return joinsettings(option, second)
diff --git a/qt/applications/workbench/workbench/plotting/figuremanager.py b/qt/applications/workbench/workbench/plotting/figuremanager.py
index 44a8ce851ee..96794c65902 100644
--- a/qt/applications/workbench/workbench/plotting/figuremanager.py
+++ b/qt/applications/workbench/workbench/plotting/figuremanager.py
@@ -22,7 +22,6 @@ from qtpy.QtWidgets import QApplication, QLabel, QFileDialog
from mantid.api import AnalysisDataService, AnalysisDataServiceObserver, ITableWorkspace, MatrixWorkspace
from mantid.kernel import logger
from mantid.plots import datafunctions, MantidAxes
-from mantid.py3compat import text_type
from mantidqt.io import open_a_file_dialog
from mantidqt.plotting.figuretype import FigureType, figure_type
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
@@ -365,7 +364,7 @@ class FigureManagerWorkbench(FigureManagerBase, QObject):
self.toolbar.hold()
def get_window_title(self):
- return text_type(self.window.windowTitle())
+ return isinstance(self.window.windowTitle(), str)
def set_window_title(self, title):
self.window.setWindowTitle(title)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
index 935f73c23cb..3f17ee1dd5f 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/utils.py
@@ -11,8 +11,6 @@ import re
import numpy as np
from matplotlib.container import ErrorbarContainer
-from mantid.py3compat import is_text_string
-
def round_to_sig_figs(number, sig_figs):
if np.isclose(number, 0):
@@ -26,7 +24,7 @@ def convert_value_to_arg_string(value):
which can be passed to a function. It is recursive so works on objects
such as lists.
"""
- if is_text_string(value):
+ if isinstance(value, str):
return "'{}'".format(value)
if isinstance(value, (list, np.ndarray, tuple)):
return "[{}]".format(', '.join([convert_value_to_arg_string(v) for v in value]))
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
index 288f9e377fb..27466d91671 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
@@ -17,9 +17,10 @@ import unittest
from qtpy.QtCore import QCoreApplication, QObject
# local imports
-from mantid.py3compat import StringIO
+from io import StringIO
from mantid.py3compat.mock import patch, Mock
+
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.execution import PythonCodeExecution, _get_imported_from_future
diff --git a/qt/python/mantidqt/widgets/jupyterconsole.py b/qt/python/mantidqt/widgets/jupyterconsole.py
index 4e6eab9d12a..8b2c6565732 100644
--- a/qt/python/mantidqt/widgets/jupyterconsole.py
+++ b/qt/python/mantidqt/widgets/jupyterconsole.py
@@ -24,7 +24,7 @@ except ImportError:
from IPython.qt.inprocess import QtInProcessKernelManager
# local imports
-from mantid.py3compat import getfullargspec
+from inspect import getfullargspec
from mantidqt.utils.asynchronous import BlockingAsyncTaskWithCallback
diff --git a/scripts/SANS/sans/command_interface/batch_csv_parser.py b/scripts/SANS/sans/command_interface/batch_csv_parser.py
index f1964f0f0ac..bf4f71268b0 100644
--- a/scripts/SANS/sans/command_interface/batch_csv_parser.py
+++ b/scripts/SANS/sans/command_interface/batch_csv_parser.py
@@ -9,7 +9,6 @@ import re
from csv import reader
from enum import Enum
-from mantid.py3compat import csv_open_type
from sans.common.constants import ALL_PERIODS
from sans.common.file_information import find_full_file_path
from sans.gui_logic.models.RowEntries import RowEntries
@@ -70,7 +69,7 @@ class BatchCsvParser(object):
for row in rows:
to_write.append(self._convert_row_to_list(row))
- with open(file_path, csv_open_type) as outfile:
+ with open(file_path, "w") as outfile:
writer_handle = csv.writer(outfile)
for line in to_write:
writer_handle.writerow(line)
diff --git a/scripts/SANS/sans/gui_logic/models/state_gui_model.py b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
index 9cc28d593e2..95a384078f5 100644
--- a/scripts/SANS/sans/gui_logic/models/state_gui_model.py
+++ b/scripts/SANS/sans/gui_logic/models/state_gui_model.py
@@ -10,7 +10,6 @@ This is one of the two models which is used for the data reduction. It contains
are not available in the model associated with the data table.
"""
-from mantid.py3compat import ensure_str
from sans.common.enums import (ReductionDimensionality, ReductionMode, RangeStepType, SaveType,
DetectorType)
from sans.gui_logic.models.model_common import ModelCommon
@@ -559,7 +558,7 @@ class StateGuiModel(ModelCommon):
@q_1d_rebin_string.setter
def q_1d_rebin_string(self, value):
- self._set_q_1d_limits(rebin_string=ensure_str(value))
+ self._set_q_1d_limits(rebin_string=value)
@property
def q_xy_max(self):
diff --git a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
index bfd635a77ea..0f355bd929c 100644
--- a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
+++ b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
@@ -7,10 +7,8 @@
import os
import unittest
-import six
-
import mantid
-from mantid.py3compat import csv_open_type, mock
+from mantid.py3compat import mock
from sans.command_interface.batch_csv_parser import BatchCsvParser
from sans.common.constants import ALL_PERIODS
from sans.gui_logic.models.RowEntries import RowEntries
@@ -227,7 +225,7 @@ class BatchCsvParserTest(unittest.TestCase):
with mock.patch(patchable, mocked_handle):
parser.save_batch_file(rows=[], file_path=expected_file_path)
- mocked_handle.assert_called_with(expected_file_path, csv_open_type)
+ mocked_handle.assert_called_with(expected_file_path, "w")
def test_parses_row_to_csv_correctly(self):
test_row = RowEntries()
--
GitLab
From e37329bd82664ce620723fe7f898ee160bc11986 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 16:44:01 +0000
Subject: [PATCH 20/37] RE #27722 Remove py3compat
---
.../PythonInterface/mantid/py3compat/enum.py | 349 ------------------
1 file changed, 349 deletions(-)
delete mode 100644 Framework/PythonInterface/mantid/py3compat/enum.py
diff --git a/Framework/PythonInterface/mantid/py3compat/enum.py b/Framework/PythonInterface/mantid/py3compat/enum.py
deleted file mode 100644
index 135e1a0617e..00000000000
--- a/Framework/PythonInterface/mantid/py3compat/enum.py
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright (C) 2004-2017 Barry Warsaw
-#
-# This file is part of flufl.enum
-#
-# flufl.enum is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
-#
-# flufl.enum is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Barry Warsaw <barry@python.org>
-#
-# Used to provide backwards compatability with Python 2
-"""Python enumerations.
-"""
-
-import re
-import sys
-import warnings
-
-from operator import itemgetter
-
-
-__metaclass__ = type
-__all__ = [
- 'Enum',
- 'EnumValue',
- 'IntEnum',
- 'make',
- ]
-
-
-COMMASPACE = ', '
-SPACE = ' '
-IDENTIFIER_RE = r'^[a-zA-Z_][a-zA-Z0-9_]*$'
-
-
-class EnumMetaclass(type):
- """Meta class for Enums."""
-
- def __init__(cls, name, bases, attributes):
- """Create an Enum class.
-
- :param cls: The class being defined.
- :param name: The name of the class.
- :param bases: The class's base classes.
- :param attributes: The class attributes.
- """
- super(EnumMetaclass, cls).__init__(name, bases, attributes)
- # Store EnumValues here for easy access.
- cls._enums = {}
- # Figure out if this class has a custom factory for building enum
- # values. The default is EnumValue, but the class (or one of its
- # bases) can declare a custom one with a special attribute.
- factory = attributes.get('__value_factory__')
- # Figure out the set of enum values on the base classes, to ensure
- # that we don't get any duplicate values. At the same time, check the
- # base classes for the special attribute.
- for basecls in cls.__mro__:
- if hasattr(basecls, '_enums'):
- cls._enums.update(basecls._enums)
- if hasattr(basecls, '__value_factory__'):
- basecls_factory = basecls.__value_factory__
- if factory is not None and basecls_factory != factory:
- raise TypeError(
- 'Conflicting enum factory in base class: {}'.format(
- basecls_factory))
- factory = basecls_factory
- # Set the factory default if necessary.
- if factory is None:
- factory = EnumValue
- # For each class attribute, create an enum value and store that back
- # on the class instead of the original value. Skip Python reserved
- # names. Also add a mapping from the original value to the enum value
- # instance so we can return the same object on conversion.
- for attr in attributes:
- if not (attr.startswith('__') and attr.endswith('__')):
- value = attributes[attr]
- enumval = factory(cls, value, attr)
- if value in cls._enums:
- other = cls._enums[value]
- # Without this, sort order is undefined and causes
- # unpredictable results for the test suite.
- first = (attr if attr < other else other)
- second = (other if attr < other else attr)
- raise ValueError("Conflicting enum value '{}' "
- "for names: '{}' and '{}'".format(
- value, first, second))
- # Store as an attribute on the class, and save the attr name.
- setattr(cls, attr, enumval)
- cls._enums[value] = attr
-
- def __dir__(cls):
- # For Python 3.2, we must explicitly convert the dict view to a list.
- # Order is not guaranteed, so don't sort it.
- return list(cls._enums.values())
-
- def __repr__(cls):
- # We want predictable reprs. Because base Enum items can have any
- # value, the only reliable way to sort the keys for the repr is based
- # on the attribute name, which must be Python identifiers.
- return '<{0} {{{1}}}>'.format(cls.__name__, COMMASPACE.join(
- '{0}: {1}'.format(value, key)
- for key, value in sorted(cls._enums.items(), key=itemgetter(1))))
-
- def __iter__(cls):
- for value in sorted(cls._enums.values()):
- yield getattr(cls, value)
-
- def __getitem__(cls, item):
- attr = cls._enums.get(item)
- if attr is None:
- # If this is an EnumValue, try it's .value attribute.
- if hasattr(item, 'value'):
- attr = cls._enums.get(item.value)
- if attr is None:
- # It wasn't value-ish -- try the attribute name. This was
- # deprecated in LP: #1167091.
- try:
- warnings.warn('Enum[item_name] is deprecated; '
- 'use getattr(Enum, item_name)',
- DeprecationWarning, 2)
- return getattr(cls, item)
- except (AttributeError, TypeError):
- raise ValueError(item)
- return getattr(cls, attr)
-
- def __call__(cls, *args):
- # One-argument calling is a deprecated synonym for getitem.
- if len(args) == 1:
- warnings.warn('MyEnum(arg) is deprecated; use MyEnum[arg]',
- DeprecationWarning, 2)
- return cls.__getitem__(args[0])
- name, source = args
- return _make(cls, name, source)
-
-
-class EnumValue:
- """Class to represent an enumeration value.
-
- EnumValue('Color', 'red', 12) prints as 'Color.red' and can be converted
- to the integer 12.
- """
- def __init__(self, enum, value, name):
- self._enum = enum
- self._value = value
- self._name = name
-
- def __repr__(self):
- return '<EnumValue: {0}.{1} [value={2}]>'.format(
- self._enum.__name__, self._name, self._value)
-
- def __str__(self):
- return '{0}.{1}'.format(self._enum.__name__, self._name)
-
- def __int__(self):
- warnings.warn('int() is deprecated; use IntEnums',
- DeprecationWarning, 2)
- return self._value
-
- def __reduce__(self):
- return getattr, (self._enum, self._name)
-
- @property
- def enum(self):
- """Return the class associated with the enum value."""
- return self._enum
-
- @property
- def name(self):
- """Return the name of the enum value."""
- return self._name
-
- @property
- def value(self):
- """Return the underlying value."""
- return self._value
-
- # Support only comparison by identity and equality. Ordered comparisions
- # are not supported.
- def __eq__(self, other):
- return self is other
-
- def __ne__(self, other):
- return self is not other
-
- def __lt__(self, other):
- # In Python 3, returning NotImplemented from an ordered comparison
- # operator will cause a TypeError to be raised. This doesn't work in
- # Python 2 though, and you'd end up with working, but incorrect,
- # ordered comparisons. In Python 2 we raise the TypeError explicitly.
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() < {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __gt__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() > {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __le__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() <= {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- def __ge__(self, other):
- if sys.version_info[0] < 3:
- raise TypeError(
- 'unorderable types: {}() >= {}()'.format(
- self.__class__.__name__, other.__class__.__name__))
- return NotImplemented
-
- __hash__ = object.__hash__
-
-
-# Define the Enum class using metaclass syntax compatible with both Python 2
-# and Python 3.
-Enum = EnumMetaclass(str('Enum'), (), {
- '__doc__': 'The public API Enum class.',
- })
-
-
-class IntEnumValue(int, EnumValue):
- """An EnumValue that is also an integer."""
-
- def __new__(cls, enum, value, attr):
- return super(IntEnumValue, cls).__new__(cls, value)
-
- __repr__ = EnumValue.__repr__
- __str__ = EnumValue.__str__
-
- # For Python 2 (Python 3 doesn't need this to work).
- __eq__ = int.__eq__
- __ne__ = int.__ne__
- __le__ = int.__le__
- __lt__ = int.__lt__
- __gt__ = int.__gt__
- __ge__ = int.__ge__
-
- # The non-deprecated version of this method.
- def __int__(self):
- return self._value
-
- # For slices and index().
- __index__ = __int__
-
-
-class IntEnumMetaclass(EnumMetaclass):
- # Define an iteration over the integer values instead of the attribute
- # names.
- def __iter__(cls):
- for key in sorted(cls._enums):
- yield getattr(cls, cls._enums[key])
-
-
-IntEnum = IntEnumMetaclass(str('IntEnum'), (Enum,), {
- '__doc__': 'A specialized enumeration with values that are also integers.',
- '__value_factory__': IntEnumValue,
- })
-
-
-if str is bytes:
- # Python 2
- STRING_TYPE = basestring
-else:
- # Python 3
- STRING_TYPE = str
-
-
-def _swap(sequence):
- for key, value in sequence:
- yield value, key
-
-
-def _make(enum_class, name, source):
- """The common implementation for `Enum()` and `IntEnum()`."""
- namespace = {}
- illegals = []
- have_strings = None
- # Auto-splitting of strings.
- if isinstance(source, STRING_TYPE):
- source = source.split()
- # Look for dict-like arguments. Specifically, it must have a callable
- # .items() attribute. Because of the way enumerate() works, here we have
- # to swap the key/values.
- try:
- source = _swap(source.items())
- except (TypeError, AttributeError):
- source = enumerate(source, start=1)
- for i, item in source:
- if isinstance(item, STRING_TYPE):
- if have_strings is None:
- have_strings = True
- elif not have_strings:
- raise ValueError('heterogeneous source')
- namespace[item] = i
- if re.match(IDENTIFIER_RE, item) is None:
- illegals.append(item)
- else:
- if have_strings is None:
- have_strings = False
- elif have_strings:
- raise ValueError('heterogeneous source')
- item_name, item_value = item
- namespace[item_name] = item_value
- if re.match(IDENTIFIER_RE, item_name) is None:
- illegals.append(item_name)
- if len(illegals) > 0:
- raise ValueError('non-identifiers: {0}'.format(SPACE.join(illegals)))
- return EnumMetaclass(str(name), (enum_class,), namespace)
-
-
-def make(name, source):
- """Return an Enum class from a name and source.
-
- This is a convenience function for defining a new enumeration given an
- existing sequence. When an sequence is used, it is iterated over to get
- the enumeration value items. The sequence iteration can either return
- strings or 2-tuples. When strings are used, values are automatically
- assigned starting from 1. When 2-tuples are used, the first item of the
- tuple is a string and the second item is the integer value.
-
- `source` must be homogeneous. You cannot mix string-only and 2-tuple
- items in the sequence.
-
- :param name: The resulting enum's class name.
- :type name: byte string (or ASCII-only unicode string)
- :param source: An object giving the enumeration value items.
- :type source: A sequence of strings or 2-tuples.
- :return: The new enumeration class.
- :rtype: instance of `EnumMetaClass`
- :raises ValueError: when a heterogeneous source is given, or when
- non-identifiers are used as enumeration value names.
- """
- warnings.warn('make() is deprecated; use Enum(name, source)',
- DeprecationWarning, 2)
- return _make(Enum, name, source)
--
GitLab
From 45927ac2151f237db2f0364656d5c4ab1294fd43 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 16:49:31 +0000
Subject: [PATCH 21/37] RE #27722 Remove unused six imports
---
Framework/PythonInterface/mantid/simpleapi.py | 1 -
Framework/PythonInterface/mantid/utils.py | 1 -
.../PythonInterface/test/python/mantid/api/AlgorithmTest.py | 1 -
Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py | 1 -
.../workbench/workbench/plotting/globalfiguremanager.py | 1 -
.../projectrecovery/recoverygui/projectrecoverymodel.py | 1 -
.../workbench/workbench/utils/workspacehistorygeneration.py | 1 -
qt/python/mantidqt/widgets/codeeditor/errorformatter.py | 1 -
.../mantidqt/widgets/codeeditor/test/test_errorformatter.py | 1 -
scripts/AbinsModules/GeneralAbInitioParser.py | 1 -
scripts/AbinsModules/LoadCRYSTAL.py | 1 -
scripts/AbinsModules/LoadDMOL3.py | 1 -
scripts/AbinsModules/LoadGAUSSIAN.py | 1 -
.../Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py | 1 -
scripts/Interface/reduction_application.py | 1 -
scripts/Interface/reduction_gui/instruments/interface.py | 1 -
.../Interface/reduction_gui/settings/application_settings.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py | 1 -
.../Interface/reduction_gui/widgets/sans/eqsans_instrument.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py | 1 -
scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py | 1 -
.../Interface/reduction_gui/widgets/sans/hfir_sample_data.py | 1 -
scripts/Muon/GUI/Common/muon_group.py | 1 -
scripts/SANS/sans/gui_logic/models/batch_process_runner.py | 1 -
scripts/SANS/sans/state/Serializer.py | 1 -
scripts/test/Abins/AbinsIOmoduleTest.py | 1 -
scripts/test/Abins/AbinsSDataTest.py | 2 --
.../test/SANS/command_interface/isis_command_interface_test.py | 1 -
28 files changed, 29 deletions(-)
diff --git a/Framework/PythonInterface/mantid/simpleapi.py b/Framework/PythonInterface/mantid/simpleapi.py
index 4a5d1486863..e5e50fc250b 100644
--- a/Framework/PythonInterface/mantid/simpleapi.py
+++ b/Framework/PythonInterface/mantid/simpleapi.py
@@ -32,7 +32,6 @@ import inspect
import os
import sys
-import six
import mantid
# This is a simple API so give access to the aliases by default as well
from mantid import __gui__, api as _api, kernel as _kernel, apiVersion
diff --git a/Framework/PythonInterface/mantid/utils.py b/Framework/PythonInterface/mantid/utils.py
index 674e4dc6815..6e3870c2ad7 100644
--- a/Framework/PythonInterface/mantid/utils.py
+++ b/Framework/PythonInterface/mantid/utils.py
@@ -70,7 +70,6 @@ def _shared_cextension():
yield
return
- import six
import os as dl
flags_orig = sys.getdlopenflags()
sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL)
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
index bed4151f814..def1ea60fa2 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import unittest
import json
diff --git a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
index f95d0e4422e..98bb21f3c75 100644
--- a/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
+++ b/Testing/SystemTests/tests/analysis/ValidateInstrumentDir.py
@@ -10,7 +10,6 @@ import glob
import os
from mantid import config
-import six
import systemtesting
diff --git a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
index b273067b93e..6443f247284 100644
--- a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
+++ b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py
@@ -12,7 +12,6 @@ import atexit
import gc
# 3rd party imports
-import six
from enum import Enum
from .observabledictionary import DictionaryAction, ObservableDictionary
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
index 8b89f9a7d9f..e6a9a893488 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/projectrecoverymodel.py
@@ -8,7 +8,6 @@
#
import os
-import six
from qtpy.QtCore import Slot, QObject
diff --git a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
index ca03b3d8aed..cf0b3187da6 100644
--- a/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
+++ b/qt/applications/workbench/workbench/utils/workspacehistorygeneration.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidworkbench package
-import six
from mantid.api import AlgorithmManager, AnalysisDataService as ADS
from workbench.projectrecovery.projectrecoverysaver import ALGS_TO_IGNORE, ALG_PROPERTIES_TO_IGNORE
diff --git a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
index ff3e6ef2702..4096c9ed4db 100644
--- a/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/errorformatter.py
@@ -11,7 +11,6 @@
import traceback
# third-party imports
-import six
class ErrorFormatter(object):
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
index b3669683895..886056a2f27 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_errorformatter.py
@@ -13,7 +13,6 @@ import traceback
import unittest
# third-party imports
-import six
# local imports
from mantidqt.widgets.codeeditor.errorformatter import ErrorFormatter
diff --git a/scripts/AbinsModules/GeneralAbInitioParser.py b/scripts/AbinsModules/GeneralAbInitioParser.py
index 8fac68301b8..b31d3738cea 100644
--- a/scripts/AbinsModules/GeneralAbInitioParser.py
+++ b/scripts/AbinsModules/GeneralAbInitioParser.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import re
import AbinsModules
diff --git a/scripts/AbinsModules/LoadCRYSTAL.py b/scripts/AbinsModules/LoadCRYSTAL.py
index 2fd57623046..02486eccf44 100644
--- a/scripts/AbinsModules/LoadCRYSTAL.py
+++ b/scripts/AbinsModules/LoadCRYSTAL.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import io
-import six
import numpy as np
import AbinsModules
from mantid.kernel import Atom, logger
diff --git a/scripts/AbinsModules/LoadDMOL3.py b/scripts/AbinsModules/LoadDMOL3.py
index 205757c3628..2fe2e5f3f5b 100644
--- a/scripts/AbinsModules/LoadDMOL3.py
+++ b/scripts/AbinsModules/LoadDMOL3.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import AbinsModules
import io
-import six
import numpy as np
from math import sqrt
from mantid.kernel import Atom
diff --git a/scripts/AbinsModules/LoadGAUSSIAN.py b/scripts/AbinsModules/LoadGAUSSIAN.py
index b830b5b852f..1ef9e949e3c 100644
--- a/scripts/AbinsModules/LoadGAUSSIAN.py
+++ b/scripts/AbinsModules/LoadGAUSSIAN.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import AbinsModules
import io
-import six
import numpy as np
from mantid.kernel import Atom
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index 67fce4425de..69cfd61f101 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import io
-import six
import sys
import unittest
diff --git a/scripts/Interface/reduction_application.py b/scripts/Interface/reduction_application.py
index b1360f48e4b..f8643250e5e 100644
--- a/scripts/Interface/reduction_application.py
+++ b/scripts/Interface/reduction_application.py
@@ -8,7 +8,6 @@
"""
Main window for reduction UIs
"""
-import six
import sys
import os
import traceback
diff --git a/scripts/Interface/reduction_gui/instruments/interface.py b/scripts/Interface/reduction_gui/instruments/interface.py
index 1e4d6694cf2..e36c0d5335f 100644
--- a/scripts/Interface/reduction_gui/instruments/interface.py
+++ b/scripts/Interface/reduction_gui/instruments/interface.py
@@ -8,7 +8,6 @@
"""
Base class for instrument-specific user interface
"""
-import six
from qtpy.QtWidgets import (QMessageBox) # noqa
import sys
import os
diff --git a/scripts/Interface/reduction_gui/settings/application_settings.py b/scripts/Interface/reduction_gui/settings/application_settings.py
index a06153d25f8..ee880e42955 100644
--- a/scripts/Interface/reduction_gui/settings/application_settings.py
+++ b/scripts/Interface/reduction_gui/settings/application_settings.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
'''
Notes:
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
index 4128405f9ab..b82fc2bd458 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-import six
from qtpy.QtWidgets import (QButtonGroup, QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import os
diff --git a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
index a39a79fb4f2..aa21774f2b0 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-import six
from qtpy.QtWidgets import (QButtonGroup, QDialog, QFileDialog, QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
import reduction_gui.widgets.util as util
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
index cd3936b1cb8..c9ee1e24ac0 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_detector.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name
-import six
from qtpy.QtWidgets import (QFrame, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
import reduction_gui.widgets.util as util
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
index 37790ffbe06..c61a5eee42d 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_instrument.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=invalid-name,protected-access
-import six
from qtpy.QtWidgets import (QFrame) # noqa
from qtpy.QtGui import (QDoubleValidator, QIntValidator) # noqa
import reduction_gui.widgets.util as util
diff --git a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
index 247f35ca5e7..0896eb240cd 100644
--- a/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
+++ b/scripts/Interface/reduction_gui/widgets/sans/hfir_sample_data.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,protected-access
-import six
import os
from qtpy.QtWidgets import (QFrame, QGroupBox, QMessageBox) # noqa
from qtpy.QtGui import (QDoubleValidator) # noqa
diff --git a/scripts/Muon/GUI/Common/muon_group.py b/scripts/Muon/GUI/Common/muon_group.py
index a7fc79330b0..16e9550f58a 100644
--- a/scripts/Muon/GUI/Common/muon_group.py
+++ b/scripts/Muon/GUI/Common/muon_group.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=C0111
from Muon.GUI.Common.ADSHandler.muon_workspace_wrapper import MuonWorkspaceWrapper
-import six
class MuonGroup(object):
diff --git a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
index 5d3b9bd370b..9236e42b22e 100644
--- a/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
+++ b/scripts/SANS/sans/gui_logic/models/batch_process_runner.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import traceback
-import six
from qtpy.QtCore import Slot, QThreadPool, Signal, QObject
from mantid.kernel import Logger
diff --git a/scripts/SANS/sans/state/Serializer.py b/scripts/SANS/sans/state/Serializer.py
index d6121ed5d83..d75fe4c9b57 100644
--- a/scripts/SANS/sans/state/Serializer.py
+++ b/scripts/SANS/sans/state/Serializer.py
@@ -7,7 +7,6 @@
import json
from enum import Enum
-import six
from sans.state.JsonSerializable import JsonSerializable
diff --git a/scripts/test/Abins/AbinsIOmoduleTest.py b/scripts/test/Abins/AbinsIOmoduleTest.py
index a926a4ae571..6c91cef88c4 100644
--- a/scripts/test/Abins/AbinsIOmoduleTest.py
+++ b/scripts/test/Abins/AbinsIOmoduleTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import unittest
import numpy as np
from mantid.simpleapi import logger
diff --git a/scripts/test/Abins/AbinsSDataTest.py b/scripts/test/Abins/AbinsSDataTest.py
index fff8944b866..f620a625182 100644
--- a/scripts/test/Abins/AbinsSDataTest.py
+++ b/scripts/test/Abins/AbinsSDataTest.py
@@ -4,8 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-
-import six
import unittest
import numpy as np
import logging
diff --git a/scripts/test/SANS/command_interface/isis_command_interface_test.py b/scripts/test/SANS/command_interface/isis_command_interface_test.py
index 34068584c0b..3f44c1ceddb 100644
--- a/scripts/test/SANS/command_interface/isis_command_interface_test.py
+++ b/scripts/test/SANS/command_interface/isis_command_interface_test.py
@@ -9,7 +9,6 @@ import tempfile
import unittest
import uuid
-import six
from mantid.py3compat import mock
from sans.command_interface.ISISCommandInterface import MaskFile
--
GitLab
From 6f98bb6cada46749d66b1db7cec62bb74c4cf826 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 16:58:26 +0000
Subject: [PATCH 22/37] RE #27722 Replace assertCountEqual imported from six
---
.../mantid/api/AnalysisDataServiceTest.py | 4 ++--
.../python/mantid/api/WorkspaceGroupTest.py | 2 +-
.../Muon/frequency_domain_context_test.py | 24 +++++++++----------
.../grouping_tab_presenter_test.py | 8 +++----
.../pairing_table_presenter_test.py | 2 +-
.../load_file_widget/loadfile_model_test.py | 8 +++----
.../loadfile_presenter_multiple_file_test.py | 24 +++++++++----------
.../loadrun_presenter_multiple_file_test.py | 24 +++++++++----------
.../utilities/muon_workspace_wrapper_test.py | 12 +++++-----
9 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
index c64b6fe1449..14843ab0dad 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
@@ -177,7 +177,7 @@ class AnalysisDataServiceTest(unittest.TestCase):
group = mtd['NewGroup']
self.assertEqual(group.size(), 3)
- six.assertCountEqual(self, group.getNames(), ["ws1", "ws2", "ws3"])
+ self.assertCountEqual(group.getNames(), ["ws1", "ws2", "ws3"])
def test_removeFromGroup_removes_workspace_from_group(self):
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces
@@ -191,7 +191,7 @@ class AnalysisDataServiceTest(unittest.TestCase):
group = mtd['NewGroup']
self.assertEqual(group.size(), 2)
- six.assertCountEqual(self, group.getNames(), ["ws1", "ws2"])
+ self.assertCountEqual(group.getNames(), ["ws1", "ws2"])
if __name__ == '__main__':
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
index 84a49970b7a..593289e715b 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
@@ -86,7 +86,7 @@ class WorkspaceGroupTest(unittest.TestCase):
group = self.create_group_via_GroupWorkspace_algorithm()
names = group.getNames()
- six.assertCountEqual(self, names, ["First", "Second"])
+ self.assertCountEqual(names, ["First", "Second"])
def test_that_a_group_is_invalidated_if_ADS_is_cleared_and_RuntimeError_raised(self):
group = self.create_group_via_GroupWorkspace_algorithm()
diff --git a/scripts/test/Muon/frequency_domain_context_test.py b/scripts/test/Muon/frequency_domain_context_test.py
index ecffd665cf9..21c33104ccf 100644
--- a/scripts/test/Muon/frequency_domain_context_test.py
+++ b/scripts/test/Muon/frequency_domain_context_test.py
@@ -46,7 +46,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.assertEquals(self.context.maxEnt_freq, ["MUSR62260_raw_data FD; MaxEnt"])
def test_add_FFT(self):
- six.assertCountEqual(self,list(self.context._FFT_freq.keys()),[FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
+ self.assertCountEqual(list(self.context._FFT_freq.keys()),[FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Re_run, "62260")
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Re, "fwd" )
self.assertEquals(self.context._FFT_freq[FFT_NAME_RE_2].Im, None )
@@ -57,7 +57,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_IM, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
- six.assertCountEqual(self,list(self.context._FFT_freq.keys()),[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
+ self.assertCountEqual(list(self.context._FFT_freq.keys()),[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD] )
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Re_run, "62260")
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Re, "top" )
self.assertEquals(self.context._FFT_freq[FFT_NAME_COMPLEX_RE].Im, "fwd" )
@@ -70,19 +70,19 @@ class MuonFreqContextTest(unittest.TestCase):
def test_get_freq_names_FFT_no_Im_all_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_RE_2, FFT_NAME_RE_MOD])
+ self.assertCountEqual(output,[FFT_NAME_RE_2, FFT_NAME_RE_MOD])
def test_get_freq_names_FFT_no_Im_Re_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Re")
- six.assertCountEqual(self,output,[FFT_NAME_RE_2])
+ self.assertCountEqual(output,[FFT_NAME_RE_2])
def test_get_freq_names_FFT_no_Im_Mod_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Mod")
- six.assertCountEqual(self,output,[FFT_NAME_RE_MOD])
+ self.assertCountEqual(output,[FFT_NAME_RE_MOD])
def test_get_freq_names_FFT_no_Im_Im_parts(self):
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="Im")
- six.assertCountEqual(self,output,[])
+ self.assertCountEqual(output,[])
def test_get_freq_names_FFT_run(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -90,7 +90,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[["62261","62262"]],group=["fwd","top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
def test_get_freq_names_FFT_group(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -98,7 +98,7 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[["62260"]],group=["top"],pair=[],phasequad=False,frequency_type="FFT All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD])
def test_get_freq_names_all(self):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_RE, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
@@ -106,28 +106,28 @@ class MuonFreqContextTest(unittest.TestCase):
self.context.add_FFT(ws_freq_name=FFT_NAME_COMPLEX_MOD, Re_run="62260",Re= "top", Im_run="62261", Im="fwd",phasequad=False)
output = self.context.get_frequency_workspace_names(run_list=[[62260],[62261]],group=["fwd"],pair=[],phasequad=False,frequency_type="All")
- six.assertCountEqual(self,output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[FFT_NAME_COMPLEX_RE, FFT_NAME_COMPLEX_IM, FFT_NAME_COMPLEX_MOD, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
def test_get_freq_names_all_with_phasequad(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62260],[62261]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
def test_get_freq_names_all_with_phasequad_Re_run(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62261]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_RE, PHASEQUAD_NAME_IM])
def test_get_freq_names_all_with_phasequad_Im_run(self):
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_RE, Re_run="62261",Re= "", Im_run="", Im="",phasequad=True)
self.context.add_FFT(ws_freq_name=PHASEQUAD_NAME_IM, Re_run="62261",Re= "", Im_run="62260", Im="",phasequad=True)
output = self.context.get_frequency_workspace_names(run_list=[[62260]],group=["fwd"],pair=[],phasequad=True,frequency_type="All")
- six.assertCountEqual(self,output,[PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
+ self.assertCountEqual(output,[PHASEQUAD_NAME_IM, FFT_NAME_RE_2, FFT_NAME_RE_MOD, "MUSR62260_raw_data FD; MaxEnt"])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
index 246ddc539a1..d243365c161 100644
--- a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
@@ -143,8 +143,8 @@ class GroupingTabPresenterTest(unittest.TestCase):
mock_load.return_value = (groups, pairs, 'description', 'pair1')
self.view.load_grouping_button.clicked.emit(True)
- six.assertCountEqual(self, self.model.group_names, ["grp1", "grp2"])
- six.assertCountEqual(self, self.model.pair_names, ["pair1"])
+ self.assertCountEqual(self.model.group_names, ["grp1", "grp2"])
+ self.assertCountEqual(self.model.pair_names, ["pair1"])
self.assertEqual(self.grouping_table_view.num_rows(), 2)
self.assertEqual(self.pairing_table_view.num_rows(), 1)
self.assertEqual(self.pairing_table_view.pairing_table.cellWidget(0, 2).currentText(), "grp1")
@@ -162,8 +162,8 @@ class GroupingTabPresenterTest(unittest.TestCase):
self.view.load_grouping_button.clicked.emit(True)
self.view.display_warning_box.assert_called_once_with('Invalid detectors in group grp2')
- six.assertCountEqual(self, self.model.group_names, ["grp1"])
- six.assertCountEqual(self, self.model.pair_names, [])
+ self.assertCountEqual(self.model.group_names, ["grp1"])
+ self.assertCountEqual(self.model.pair_names, [])
self.assertEqual(self.grouping_table_view.num_rows(), 1)
self.assertEqual(self.pairing_table_view.num_rows(), 0)
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
index 022b166a271..f088afda57b 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
@@ -257,7 +257,7 @@ class PairingTablePresenterTest(unittest.TestCase):
self.assertEqual(str(self.view.get_table_item_text(0, 0)), "pair_1")
self.assertEqual(str(self.view.get_table_item_text(1, 0)), "pair_2")
self.assertEqual(str(self.view.get_table_item_text(2, 0)), "pair_3")
- six.assertCountEqual(self, self.model.pair_names, ["pair_1", "pair_2", "pair_3"])
+ self.assertCountEqual(self.model.pair_names, ["pair_1", "pair_2", "pair_3"])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/load_file_widget/loadfile_model_test.py b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
index dbf2335c28d..425915957b2 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_model_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
@@ -44,8 +44,8 @@ class LoadFileWidgetModelTest(unittest.TestCase):
self.model.execute()
- six.assertCountEqual(self, [os.path.split(filename)[-1] for filename in self.model.loaded_filenames], files)
- six.assertCountEqual(self, self.model.loaded_runs, [[19489], [6473], [6475]])
+ self.assertCountEqual([os.path.split(filename)[-1] for filename in self.model.loaded_filenames], files)
+ self.assertCountEqual(self.model.loaded_runs, [[19489], [6473], [6475]])
def test_model_is_cleared_correctly(self):
files = ['EMU00019489.nxs', 'emu00006473.nxs', 'emu00006475.nxs']
@@ -64,9 +64,9 @@ class LoadFileWidgetModelTest(unittest.TestCase):
with self.assertRaises(ValueError):
self.model.execute()
- six.assertCountEqual(self, [os.path.split(filename)[-1] for filename in self.model.loaded_filenames],
+ self.assertCountEqual([os.path.split(filename)[-1] for filename in self.model.loaded_filenames],
['EMU00019489.nxs', 'emu00006473.nxs'])
- six.assertCountEqual(self, self.model.loaded_runs, [[19489], [6473]])
+ self.assertCountEqual(self.model.loaded_runs, [[19489], [6473]])
if __name__ == '__main__':
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
index bafb3549d77..fd5c2154bfa 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
@@ -147,9 +147,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.wait_for_thread(self.presenter._load_thread)
# Load will take the last occurrence of the run from the list
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234]])
#
@run_test_with_and_without_threading
@@ -165,9 +165,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.wait_for_thread(self.presenter._load_thread)
# Load will take the last occurrence of the run from the user input
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir1/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234]])
@run_test_with_and_without_threading
def test_that_loading_two_files_from_browse_sets_model_and_interface_correctly(self):
@@ -246,10 +246,10 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.presenter.on_browse_button_clicked()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames,
+ self.assertCountEqual(self.model.loaded_filenames,
["C:/dir1/file1.nxs", "C:/dir2/file2.nxs", "C:/dir1/file3.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_1, workspace_2, workspace_3])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234], [1235], [1236]])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_1, workspace_2, workspace_3])
+ self.assertCountEqual(self.model.loaded_runs, [[1234], [1235], [1236]])
self.assertEqual(self.view.get_file_edit_text(), "C:/dir1/file3.nxs")
@@ -271,9 +271,9 @@ class LoadFileWidgetPresenterMultipleFileModeTest(unittest.TestCase):
self.presenter.on_browse_button_clicked()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["C:/dir2/file1.nxs", "C:/dir2/file2.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [workspace_3, workspace_2])
- six.assertCountEqual(self, self.model.loaded_runs, [[1234], [1235]])
+ self.assertCountEqual(self.model.loaded_filenames, ["C:/dir2/file1.nxs", "C:/dir2/file2.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [workspace_3, workspace_2])
+ self.assertCountEqual(self.model.loaded_runs, [[1234], [1235]])
self.assertEqual(self.view.get_file_edit_text(), "C:/dir2/file1.nxs")
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
index 5e4b2b85795..97b01198a02 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
@@ -114,9 +114,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_decrement_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file1.nxs", "file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[1], [2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[1], [2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file1.nxs", "file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[1], [2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[1], [2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), "1")
@@ -128,9 +128,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_increment_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs", "file5.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4], [5]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4], [5]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs", "file5.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4], [5]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4], [5]])
self.assertEqual(self.view.get_run_edit_text(), "5")
@@ -143,9 +143,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_decrement_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), '2-4')
@@ -158,9 +158,9 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.handle_increment_run()
self.wait_for_thread(self.presenter._load_thread)
- six.assertCountEqual(self, self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
- six.assertCountEqual(self, self.model.loaded_workspaces, [[2], [3], [4]])
- six.assertCountEqual(self, self.model.loaded_runs, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_filenames, ["file2.nxs", "file3.nxs", "file4.nxs"])
+ self.assertCountEqual(self.model.loaded_workspaces, [[2], [3], [4]])
+ self.assertCountEqual(self.model.loaded_runs, [[2], [3], [4]])
self.assertEqual(self.view.get_run_edit_text(), '2-4')
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
index 947e1ea670a..5a664fc458b 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
@@ -122,8 +122,8 @@ class MuonWorkspaceTest(unittest.TestCase):
self.assertTrue(simpleapi.mtd.doesExist("test"))
ads_workspace = simpleapi.mtd["test"]
- six.assertCountEqual(self, ads_workspace.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ads_workspace.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ads_workspace.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ads_workspace.readY(0), [10, 10, 10, 10])
def test_that_hiding_the_workspace_removes_it_from_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
@@ -139,8 +139,8 @@ class MuonWorkspaceTest(unittest.TestCase):
ws_property = workspace_handle.workspace
- six.assertCountEqual(self, ws_property.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ws_property.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ws_property.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ws_property.readY(0), [10, 10, 10, 10])
def test_that_workspace_property_returns_workspace_when_in_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
@@ -148,8 +148,8 @@ class MuonWorkspaceTest(unittest.TestCase):
workspace_handle.show("arbitrary_name")
ws_property = workspace_handle.workspace
- six.assertCountEqual(self, ws_property.readX(0), [1, 2, 3, 4])
- six.assertCountEqual(self, ws_property.readY(0), [10, 10, 10, 10])
+ self.assertCountEqual(ws_property.readX(0), [1, 2, 3, 4])
+ self.assertCountEqual(ws_property.readY(0), [10, 10, 10, 10])
def test_that_can_change_name_when_workspace_not_in_ADS(self):
workspace_handle = MuonWorkspaceWrapper(workspace=self.workspace)
--
GitLab
From 7026cfae56b794aefe53218a38a0f920baddb63f Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 17:01:45 +0000
Subject: [PATCH 23/37] RE #27722 Replace six.integer_types
---
Framework/PythonInterface/plugins/algorithms/Abins.py | 4 ++--
Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py | 2 +-
qt/python/mantidqt/utils/qt/testing/gui_test_runner.py | 2 +-
scripts/AbinsModules/AtomsData.py | 2 +-
scripts/AbinsModules/DWSingleCrystalData.py | 4 ++--
scripts/AbinsModules/KpointsData.py | 4 ++--
scripts/AbinsModules/PowderData.py | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/Abins.py b/Framework/PythonInterface/plugins/algorithms/Abins.py
index 40a3e76fb9c..32f793369fe 100644
--- a/Framework/PythonInterface/plugins/algorithms/Abins.py
+++ b/Framework/PythonInterface/plugins/algorithms/Abins.py
@@ -768,7 +768,7 @@ class Abins(PythonAlgorithm):
:param message_end: closing part of the error message.
"""
optimal_size = AbinsParameters.performance['optimal_size']
- if not (isinstance(optimal_size, six.integer_types) and optimal_size > 0):
+ if not (isinstance(optimal_size, int) and optimal_size > 0):
raise RuntimeError("Invalid value of optimal_size" + message_end)
def _check_threads(self, message_end=None):
@@ -778,7 +778,7 @@ class Abins(PythonAlgorithm):
"""
if PATHOS_FOUND:
threads = AbinsModules.AbinsParameters.performance['threads']
- if not (isinstance(threads, six.integer_types) and 1 <= threads <= mp.cpu_count()):
+ if not (isinstance(threads, int) and 1 <= threads <= mp.cpu_count()):
raise RuntimeError("Invalid number of threads for parallelisation over atoms" + message_end)
def _validate_ab_initio_file_extension(self, filename_full_path=None, expected_file_extension=None):
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
index 46218e7a196..bed91c024e0 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
@@ -395,7 +395,7 @@ class LoadVesuvio(LoadEmptyVesuvio):
"""Given a string containing either a filename/partial filename or run number find the correct
file prefix"""
vesuvio = config.getInstrument("VESUVIO")
- if isinstance(run_or_filename, six.integer_types):
+ if isinstance(run_or_filename, int):
run_no = run_or_filename
return vesuvio.filePrefix(int(run_no)) + str(run_or_filename)
else:
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
index 28ee90e5958..8d1185f8a21 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
@@ -98,7 +98,7 @@ class ScriptRunner(object):
if inspect.isgenerator(ret):
self.script_iter.append(ret)
ret = None
- elif isinstance(ret, six.integer_types) or isinstance(ret, float):
+ elif isinstance(ret, int) or isinstance(ret, float):
# Start non-blocking pause in seconds
self.pause_timer.start(int(ret * 1000))
ret = None
diff --git a/scripts/AbinsModules/AtomsData.py b/scripts/AbinsModules/AtomsData.py
index aaa127c7fc1..df5da370a40 100644
--- a/scripts/AbinsModules/AtomsData.py
+++ b/scripts/AbinsModules/AtomsData.py
@@ -51,7 +51,7 @@ class AtomsData(AbinsModules.GeneralData):
# "sort"
sort = item["sort"]
- if not (isinstance(sort, six.integer_types) or np.issubdtype(sort.dtype, np.integer)):
+ if not (isinstance(sort, int) or np.issubdtype(sort.dtype, np.integer)):
raise ValueError("Parameter sort should be integer.")
if sort < 0:
raise ValueError("Parameter sort cannot be negative.")
diff --git a/scripts/AbinsModules/DWSingleCrystalData.py b/scripts/AbinsModules/DWSingleCrystalData.py
index 04aa060504e..5a44c21eca1 100644
--- a/scripts/AbinsModules/DWSingleCrystalData.py
+++ b/scripts/AbinsModules/DWSingleCrystalData.py
@@ -27,7 +27,7 @@ class DWSingleCrystalData(AbinsModules.GeneralData):
else:
raise ValueError("Improper value of temperature.")
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms
else:
raise ValueError("Improper number of atoms.")
@@ -70,7 +70,7 @@ class DWSingleCrystalData(AbinsModules.GeneralData):
:param data: Debye-Waller factor to check
:param atom: number of atom
"""
- if not isinstance(atom, six.integer_types):
+ if not isinstance(atom, int):
raise ValueError("Number of atom should be an integer.")
if atom < 0 or atom > self._num_atoms: # here we count from zero
raise ValueError("Invalid number of atom.")
diff --git a/scripts/AbinsModules/KpointsData.py b/scripts/AbinsModules/KpointsData.py
index c3d3a637565..fad7c8b7cc8 100644
--- a/scripts/AbinsModules/KpointsData.py
+++ b/scripts/AbinsModules/KpointsData.py
@@ -42,12 +42,12 @@ class KpointsData(AbinsModules.GeneralData):
"""
super(KpointsData, self).__init__()
- if isinstance(num_k, six.integer_types) and num_k > 0:
+ if isinstance(num_k, int) and num_k > 0:
self._num_k = num_k
else:
raise ValueError("Invalid number of k-points.")
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms # number of displacements for one k-point
else:
raise ValueError("Invalid number of atoms.")
diff --git a/scripts/AbinsModules/PowderData.py b/scripts/AbinsModules/PowderData.py
index 4efcc514794..2a684d7c4bb 100644
--- a/scripts/AbinsModules/PowderData.py
+++ b/scripts/AbinsModules/PowderData.py
@@ -15,7 +15,7 @@ class PowderData(AbinsModules.GeneralData):
def __init__(self, num_atoms=None):
super(PowderData, self).__init__()
- if isinstance(num_atoms, six.integer_types) and num_atoms > 0:
+ if isinstance(num_atoms, int) and num_atoms > 0:
self._num_atoms = num_atoms
else:
raise ValueError("Invalid value of atoms.")
--
GitLab
From fbd219ae39dc4155f085a8ed160f8d6e1362accc Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 17:06:46 +0000
Subject: [PATCH 24/37] RE #27722 Replace six.text_types
---
.../test/python/mantid/kernel/ConfigServiceTest.py | 2 +-
.../test/python/mantid/kernel/UnitLabelTest.py | 4 ++--
scripts/AbinsModules/IOmodule.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index 31e3bb1461b..5881e2e6da6 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -109,7 +109,7 @@ class ConfigServiceTest(unittest.TestCase):
def test_appending_paths(self):
new_path_list = self._setup_test_areas()
try:
- config.appendDataSearchDir(six.text_type(new_path_list[0]))
+ config.appendDataSearchDir(str(new_path_list[0]))
updated_paths = config.getDataSearchDirs()
finally:
self._clean_up_test_areas()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index 22fd7f36020..69ab0036e3e 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -24,7 +24,7 @@ class UnitLabelTest(unittest.TestCase):
def test_utf8_is_converted_to_unicode_object(self):
tof = UnitFactory.Instance().create("TOF")
unit_lbl = tof.symbol()
- self.assertTrue(isinstance(unit_lbl.utf8(), six.text_type))
+ self.assertTrue(isinstance(unit_lbl.utf8(), str))
self.assertEqual(u"\u03bcs", unit_lbl.utf8())
self.assertEqual("\mu s", unit_lbl.latex())
@@ -36,7 +36,7 @@ class UnitLabelTest(unittest.TestCase):
def test_unicode_function_produces_unicode_string_from_label_py2(self):
if sys.version_info[0] < 3:
label = UnitLabel("MyLabel", u"\u03bcs","\mu s")
- self.assertTrue(isinstance(unicode(label), six.text_type))
+ self.assertTrue(isinstance(unicode(label), str))
self.assertEqual(u"\u03bcs", unicode(label))
else:
pass
diff --git a/scripts/AbinsModules/IOmodule.py b/scripts/AbinsModules/IOmodule.py
index 18f4fefbec8..562b1aea09e 100644
--- a/scripts/AbinsModules/IOmodule.py
+++ b/scripts/AbinsModules/IOmodule.py
@@ -309,7 +309,7 @@ class IOmodule(object):
:param item: item to convert to unicode str if Python 2 str
:returns: laundered item
"""
- if isinstance(item, six.text_type):
+ if isinstance(item, str):
return item.encode('utf-8')
else:
return item
--
GitLab
From 6795323ae392f4fe57a58873898800e373749906 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 17:14:33 +0000
Subject: [PATCH 25/37] RE #27722 Remove misc references to six
---
Framework/PythonInterface/plugins/algorithms/Abins.py | 1 -
Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py | 2 --
.../PythonInterface/test/python/mantid/SimpleAPITest.py | 5 ++---
.../test/python/mantid/api/AnalysisDataServiceTest.py | 1 -
.../test/python/mantid/api/WorkspaceGroupTest.py | 1 -
.../test/python/mantid/kernel/ConfigServiceTest.py | 2 --
.../test/python/mantid/kernel/UnitLabelTest.py | 1 -
MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py | 4 +---
qt/python/mantidqt/utils/qt/testing/gui_test_runner.py | 1 -
scripts/AbinsModules/AtomsData.py | 1 -
scripts/AbinsModules/DWSingleCrystalData.py | 2 --
scripts/AbinsModules/GeneralAbInitioProgram.py | 4 +---
scripts/AbinsModules/IOmodule.py | 1 -
scripts/AbinsModules/KpointsData.py | 1 -
scripts/AbinsModules/PowderData.py | 1 -
scripts/Engineering/EnginX.py | 4 +---
scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py | 1 -
scripts/test/Muon/frequency_domain_context_test.py | 1 -
.../test/Muon/grouping_tab/grouping_tab_presenter_test.py | 1 -
.../test/Muon/grouping_tab/pairing_table_presenter_test.py | 1 -
scripts/test/Muon/load_file_widget/loadfile_model_test.py | 2 --
.../loadfile_presenter_multiple_file_test.py | 2 --
.../load_run_widget/loadrun_presenter_multiple_file_test.py | 2 --
scripts/test/Muon/utilities/muon_workspace_wrapper_test.py | 2 --
24 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/Abins.py b/Framework/PythonInterface/plugins/algorithms/Abins.py
index 32f793369fe..0fcccce1e07 100644
--- a/Framework/PythonInterface/plugins/algorithms/Abins.py
+++ b/Framework/PythonInterface/plugins/algorithms/Abins.py
@@ -12,7 +12,6 @@ except ImportError:
PATHOS_FOUND = False
import numpy as np
-import six
import os
import re
diff --git a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
index bed91c024e0..24f212cf776 100644
--- a/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
+++ b/Framework/PythonInterface/plugins/algorithms/LoadVesuvio.py
@@ -14,8 +14,6 @@ import copy
import numpy as np
import os
import re
-import six
-
RUN_PROP = "Filename"
WKSP_PROP = "OutputWorkspace"
MODE_PROP = "Mode"
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
index 3494e2105bc..06328a0c5a0 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPITest.py
@@ -11,7 +11,6 @@ from mantid.api import (AlgorithmFactory, AlgorithmProxy, IAlgorithm, IEventWork
PythonAlgorithm, MatrixWorkspace, mtd)
import mantid.simpleapi as simpleapi
import numpy
-import six
class SimpleAPITest(unittest.TestCase):
@@ -191,10 +190,10 @@ class SimpleAPITest(unittest.TestCase):
self.assertEqual(method_parameters[1:],
list(simpleapi.rebin.__signature__.parameters))
else:
- freefunction_sig = six.get_function_code(simpleapi.rebin).co_varnames
+ freefunction_sig = inspect.getsource(simpleapi.rebin).co_varnames
expected_method_sig = ['self']
expected_method_sig.extend(freefunction_sig)
- self.assertEqual(six.get_function_code(MatrixWorkspace.rebin).co_varnames, tuple(expected_method_sig))
+ self.assertEqual(inspect.getsource(MatrixWorkspace.rebin).co_varnames, tuple(expected_method_sig))
def test_function_attached_as_workpace_method_does_the_same_as_the_free_function(self):
# Use Rebin as a test
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
index 14843ab0dad..0cc5122f2a0 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import unittest
from testhelpers import run_algorithm
from mantid.api import (AnalysisDataService, AnalysisDataServiceImpl,
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
index 593289e715b..be9255a49e9 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceGroupTest.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import unittest
from testhelpers import run_algorithm
from mantid.api import mtd, WorkspaceGroup, MatrixWorkspace, AnalysisDataService, WorkspaceFactory
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index 5881e2e6da6..565c302d393 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -11,8 +11,6 @@ import unittest
from mantid.kernel import (ConfigService, ConfigServiceImpl, config,
std_vector_str, FacilityInfo, InstrumentInfo)
-import six
-
class ConfigServiceTest(unittest.TestCase):
__dirs_to_rm = []
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index 69ab0036e3e..ff25d20fad3 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
from mantid.kernel import UnitFactory, UnitLabel
-import six
import sys
class UnitLabelTest(unittest.TestCase):
diff --git a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
index f7a57eb7ce1..3d3fdceba7f 100644
--- a/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
+++ b/MantidPlot/pymantidplot/mpl/backend_mtdqt4agg.py
@@ -25,8 +25,6 @@ except ImportError:
# Import everything from the *real* matplotlib backend
from matplotlib.backends.backend_qt4agg import *
from matplotlib.figure import Figure
-import six
-
# Remove the implementations of new_figure_manager_*. We replace them below
del new_figure_manager
try:
@@ -70,7 +68,7 @@ class QAppThreadCall(QtCore.QObject):
QtCore.QMetaObject.invokeMethod(self, "on_call",
QtCore.Qt.BlockingQueuedConnection)
if self._exc_info is not None:
- six.reraise(*self._exc_info)
+ raise self._exc_info[1].with_traceback(self._exc_info[2])
return self._result
@QtCore.pyqtSlot()
diff --git a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
index 8d1185f8a21..eda1f09f20a 100644
--- a/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
+++ b/qt/python/mantidqt/utils/qt/testing/gui_test_runner.py
@@ -8,7 +8,6 @@
#
#
import inspect
-import six
import traceback
from qtpy.QtCore import QTimer, QMetaObject, Qt
diff --git a/scripts/AbinsModules/AtomsData.py b/scripts/AbinsModules/AtomsData.py
index df5da370a40..1b987dd369d 100644
--- a/scripts/AbinsModules/AtomsData.py
+++ b/scripts/AbinsModules/AtomsData.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import numpy as np
-import six
import AbinsModules
diff --git a/scripts/AbinsModules/DWSingleCrystalData.py b/scripts/AbinsModules/DWSingleCrystalData.py
index 5a44c21eca1..cd342fb1f57 100644
--- a/scripts/AbinsModules/DWSingleCrystalData.py
+++ b/scripts/AbinsModules/DWSingleCrystalData.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import numpy as np
-import six
-
# Abins modules
import AbinsModules
diff --git a/scripts/AbinsModules/GeneralAbInitioProgram.py b/scripts/AbinsModules/GeneralAbInitioProgram.py
index d8de840ad56..022e149ae17 100644
--- a/scripts/AbinsModules/GeneralAbInitioProgram.py
+++ b/scripts/AbinsModules/GeneralAbInitioProgram.py
@@ -6,7 +6,6 @@
# SPDX - License - Identifier: GPL - 3.0 +
from mantid.kernel import logger
import AbinsModules
-import six
from mantid.kernel import Atom
@@ -16,8 +15,7 @@ class GeneralAbInitioProgramName(type):
# noinspection PyMethodMayBeStatic
-@six.add_metaclass(GeneralAbInitioProgramName)
-class GeneralAbInitioProgram(object):
+class GeneralAbInitioProgram(object, metaclass=GeneralAbInitioProgramName):
"""
A general class which groups all methods which should be inherited or implemented by an ab initio program used
in INS analysis.
diff --git a/scripts/AbinsModules/IOmodule.py b/scripts/AbinsModules/IOmodule.py
index 562b1aea09e..14bc7e64e5f 100644
--- a/scripts/AbinsModules/IOmodule.py
+++ b/scripts/AbinsModules/IOmodule.py
@@ -8,7 +8,6 @@ import hashlib
import io
import json
import os
-import six
import subprocess
import shutil
import h5py
diff --git a/scripts/AbinsModules/KpointsData.py b/scripts/AbinsModules/KpointsData.py
index fad7c8b7cc8..c94f643b90a 100644
--- a/scripts/AbinsModules/KpointsData.py
+++ b/scripts/AbinsModules/KpointsData.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import numpy as np
-import six
import AbinsModules
diff --git a/scripts/AbinsModules/PowderData.py b/scripts/AbinsModules/PowderData.py
index 2a684d7c4bb..9aa69421a4f 100644
--- a/scripts/AbinsModules/PowderData.py
+++ b/scripts/AbinsModules/PowderData.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import AbinsModules
diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py
index d37ee5404ff..6bb5c444975 100644
--- a/scripts/Engineering/EnginX.py
+++ b/scripts/Engineering/EnginX.py
@@ -10,8 +10,6 @@ import numpy as np
import os
from platform import system
from shutil import copy2
-import six
-
import mantid.plots # noqa
import Engineering.EnggUtils as Utils
import mantid.simpleapi as simple
@@ -626,7 +624,7 @@ def _save_out(run_number, focus_directory, focus_general, output, enginx_file_na
dat_name, genie_filename, gss_name, hdf5_name, nxs_name = _find_focus_file_location(bank_id, focus_directory,
enginx_file_name_format,
run_number)
- if not six.u(bank_id).isnumeric():
+ if not str(bank_id).isnumeric():
bank_id = 0
# save the files out to the user directory
simple.SaveFocusedXYE(InputWorkspace=output, Filename=dat_name, SplitFiles=False,
diff --git a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
index c77017a18bd..b1917bfd8e5 100644
--- a/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
+++ b/scripts/HFIR_4Circle_Reduction/reduce4circleGUI.py
@@ -10,7 +10,6 @@
# MainWindow application for reducing HFIR 4-circle
#
################################################################################
-import six
import os
import sys
import csv
diff --git a/scripts/test/Muon/frequency_domain_context_test.py b/scripts/test/Muon/frequency_domain_context_test.py
index 21c33104ccf..ea083c271a8 100644
--- a/scripts/test/Muon/frequency_domain_context_test.py
+++ b/scripts/test/Muon/frequency_domain_context_test.py
@@ -4,7 +4,6 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
-import six
import sys
import unittest
diff --git a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
index d243365c161..8d9ac2bc0ee 100644
--- a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
@@ -5,7 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-import six
from mantid.py3compat import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantid import ConfigService
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
index f088afda57b..052d81b9cc7 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
@@ -7,7 +7,6 @@
import unittest
from mantid.py3compat import mock
from mantidqt.utils.qt.testing import start_qapplication
-import six
from qtpy.QtWidgets import QWidget
from Muon.GUI.Common.grouping_tab_widget.grouping_tab_widget_model import GroupingTabModel
diff --git a/scripts/test/Muon/load_file_widget/loadfile_model_test.py b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
index 425915957b2..bf323863e83 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_model_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_model_test.py
@@ -8,8 +8,6 @@ import os
import unittest
from mantidqt.utils.qt.testing import start_qapplication
-import six
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.test_helpers.context_setup import setup_context_for_tests
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
index fd5c2154bfa..dadc53aff55 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
@@ -9,8 +9,6 @@ import unittest
from mantid.py3compat import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
-import six
-
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
from Muon.GUI.Common.load_file_widget.presenter import BrowseFileWidgetPresenter
from Muon.GUI.Common.load_file_widget.view import BrowseFileWidgetView
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
index 97b01198a02..4000a016acd 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
@@ -9,8 +9,6 @@ import unittest
from mantid.py3compat import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
-import six
-
from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
from Muon.GUI.Common.load_run_widget.load_run_presenter import LoadRunWidgetPresenter
from Muon.GUI.Common.load_run_widget.load_run_view import LoadRunWidgetView
diff --git a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
index 5a664fc458b..1f741d8f7bd 100644
--- a/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
+++ b/scripts/test/Muon/utilities/muon_workspace_wrapper_test.py
@@ -5,8 +5,6 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-import six
-
import mantid.simpleapi as simpleapi
from mantid.api import ITableWorkspace, WorkspaceGroup
from mantid.dataobjects import Workspace2D
--
GitLab
From d5731a5c189b871093d6b710dd14c31243e2e0b4 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 08:54:43 +0000
Subject: [PATCH 26/37] RE #27722 Remove six imports from copyrightupdate
---
tools/Copyright/copyrightupdate.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/Copyright/copyrightupdate.py b/tools/Copyright/copyrightupdate.py
index 7233a60a940..698270d5eba 100755
--- a/tools/Copyright/copyrightupdate.py
+++ b/tools/Copyright/copyrightupdate.py
@@ -11,7 +11,6 @@ import os
import pprint
import re
-
######################################################################################################################
# Script level variables
@@ -252,7 +251,7 @@ process_file_tree(root_path)
if not args.noreport:
#write out reporting files
for reporting_filename, reporting_dict in reporting_dictionaries.items():
- with open(reporting_filename,"w") as reporting_file:
+ with open(reporting_filename, "w") as reporting_file:
for key, value in reporting_dict.items():
reporting_file.write("{0}\t{1}{2}".format(key,value,os.linesep))
--
GitLab
From c69aa1d13a94104329327c6c18285940982e4d52 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 10 Mar 2020 14:43:01 +0000
Subject: [PATCH 27/37] RE #27722 Add unit tests for qappthreadcall
---
qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
index acd696dd833..7acf3fc7b3a 100644
--- a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
+++ b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
@@ -9,12 +9,11 @@
#
import unittest
-from time import sleep
+from qtpy.QtWidgets import QApplication
+from mantidqt.utils.asynchronous import AsyncTask, TaskExitCode
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
-from qtpy.QtWidgets import QApplication
from mantidqt.utils.qt.testing import start_qapplication
-from mantidqt.utils.asynchronous import AsyncTask, TaskExitCode
class CustomException(Exception):
pass
--
GitLab
From 4e16602fd06eab4095b92b5e5d65a4ef0881ceaf Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 08:57:14 +0000
Subject: [PATCH 28/37] RE #27722 Remove other python version checks
---
.../plugins/algorithms/NMoldyn4Interpolation.py | 12 ------------
.../plugins/algorithms/NMoldyn4InterpolationTest.py | 7 +------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py b/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
index 6600a2f98ed..99b6d947ea7 100644
--- a/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
+++ b/Framework/PythonInterface/plugins/algorithms/NMoldyn4Interpolation.py
@@ -10,8 +10,6 @@ import math
import numpy as np
import scipy as sc
-from sys import version_info
-
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
@@ -48,8 +46,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
doc='Output Workspace of remapped simulation data')
def PyExec(self):
- self.validate_environment()
-
e_fixed = float(self.getPropertyValue('EFixed'))
# Loads simulated workspace
simulation = self.getPropertyValue('InputWorkspace')
@@ -80,14 +76,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
VerticalAxisValues=ref_Q, WorkspaceTitle=output_ws)
self.setProperty('OutputWorkspace', output_ws)
- def validate_environment(self):
- # RHEL 6 produces spurious results because it runs on Python 2.6.X
- # test and warn for this. When RHEL6 is no longer supported this check
- # can be removed
- python_version = version_info
- if python_version < (2, 7, 0):
- logger.warning("NMoldyn4Interpolation may not run correctly on Python 2.6 and below")
-
def validate_bounds(self, sim_X, ref_X, sim_Q, ref_Q):
if min(sim_X) > min(ref_X):
raise ValueError('Minimum simulated X value is higher than minimum '
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
index f69e5edadcc..c875ef038b9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/NMoldyn4InterpolationTest.py
@@ -110,9 +110,4 @@ class NMoldyn4InterpolationTest(unittest.TestCase):
if __name__ == "__main__":
- python_version = version_info
- if python_version < (2, 7, 0):
- logger.warning("Not running this test as it requires Python >= 2.7. Version found: {0}".
- format(python_version))
- else:
- unittest.main()
+ unittest.main()
--
GitLab
From 2c239f9ea751865a6aa809256d7821f87d1ccf1b Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 13:24:27 +0000
Subject: [PATCH 29/37] RE #27722 autopep8 E302 Expected blank lines
---
.../mantid/kernel/funcinspect.py | 5 ++++
.../PythonInterface/mantid/kernel/plugins.py | 10 +++++++
.../mantid/plots/_compatability.py | 2 ++
.../mantid/plots/mantidaxes.py | 6 ++++
.../mantid/plots/plotfunctions.py | 3 ++
.../algorithms/ExportSampleLogsToCSVFile.py | 2 ++
.../plugins/algorithms/LRAutoReduction.py | 2 ++
.../plugins/algorithms/LRScalingFactors.py | 2 ++
.../plugins/algorithms/RetrieveRunInfo.py | 1 +
.../algorithms/SelectNexusFilesByMetadata.py | 1 +
.../algorithms/WorkflowAlgorithms/MSDFit.py | 2 ++
.../WorkflowAlgorithms/TransmissionUtils.py | 2 ++
.../WorkflowAlgorithms/USANSReduction.py | 2 ++
.../test/python/mantid/ImportModuleTest.py | 1 +
.../test/python/mantid/SimpleAPIFitTest.py | 1 +
.../test/python/mantid/SimpleAPILoadTest.py | 1 +
.../mantid/SimpleAPIRenameWorkspaceTest.py | 1 +
.../python/mantid/api/AlgorithmHistoryTest.py | 2 ++
.../test/python/mantid/api/AlgorithmTest.py | 1 +
.../test/python/mantid/api/AxisTest.py | 1 +
.../mantid/api/DataProcessorAlgorithmTest.py | 2 ++
.../python/mantid/api/ExperimentInfoTest.py | 1 +
.../python/mantid/api/FrameworkManagerTest.py | 1 +
.../python/mantid/api/IEventWorkspaceTest.py | 1 +
.../python/mantid/api/IMaskWorkspaceTest.py | 1 +
.../python/mantid/api/IPeakFunctionTest.py | 3 ++
.../python/mantid/api/ITableWorkspaceTest.py | 1 +
.../test/python/mantid/api/JacobianTest.py | 1 +
.../python/mantid/api/MDEventWorkspaceTest.py | 1 +
.../test/python/mantid/api/MDGeometryTest.py | 1 +
.../python/mantid/api/MatrixWorkspaceTest.py | 2 ++
.../mantid/api/MultipleExperimentInfos.py | 1 +
.../mantid/api/MultipleFilePropertyTest.py | 1 +
.../test/python/mantid/api/ProgressTest.py | 1 +
.../test/python/mantid/api/ProjectionTest.py | 1 +
.../mantid/api/PythonAlgorithmTraitsTest.py | 5 ++++
.../PythonAlgorithmWorkspacePropertyTest.py | 1 +
.../python/mantid/api/RunPythonScriptTest.py | 1 +
.../test/python/mantid/api/RunTest.py | 1 +
.../python/mantid/api/SpectrumInfoTest.py | 1 +
.../python/mantid/api/WorkspaceFactoryTest.py | 1 +
.../mantid/api/WorkspacePropertiesTest.py | 1 +
.../test/python/mantid/api/WorkspaceTest.py | 1 +
.../mantid/api/WorkspaceValidatorsTest.py | 1 +
.../mantid/dataobjects/EventListTest.py | 1 +
.../python/mantid/geometry/BoundingBoxTest.py | 1 +
.../mantid/geometry/ComponentInfoTest.py | 1 +
.../python/mantid/geometry/GoniometerTest.py | 1 +
.../python/mantid/geometry/IComponentTest.py | 1 +
.../mantid/geometry/OrientedLatticeTest.py | 1 +
.../python/mantid/geometry/PeakShapeTest.py | 1 +
.../geometry/RectangularDetectorTest.py | 1 +
.../mantid/geometry/ReferenceFrameTest.py | 1 +
.../mantid/geometry/SymmetryElementTest.py | 1 +
.../mantid/geometry/SymmetryOperationTest.py | 1 +
.../python/mantid/geometry/UnitCellTest.py | 1 +
.../kernel/ArrayBoundedValidatorTest.py | 1 +
.../mantid/kernel/ArrayLengthValidatorTest.py | 1 +
.../python/mantid/kernel/ArrayPropertyTest.py | 1 +
.../mantid/kernel/BoundedValidatorTest.py | 1 +
.../mantid/kernel/CompositeValidatorTest.py | 1 +
.../python/mantid/kernel/ConfigServiceTest.py | 2 ++
.../python/mantid/kernel/DeltaEModeTest.py | 1 +
.../python/mantid/kernel/FacilityInfoTest.py | 1 +
.../kernel/FilteredTimeSeriesPropertyTest.py | 1 +
.../mantid/kernel/IPropertySettingsTest.py | 1 +
.../python/mantid/kernel/ListValidatorTest.py | 1 +
.../mantid/kernel/MandatoryValidatorTest.py | 1 +
.../python/mantid/kernel/MemoryStatsTest.py | 1 +
.../python/mantid/kernel/NullValidatorTest.py | 1 +
.../python/mantid/kernel/OptionalBoolTest.py | 1 +
.../python/mantid/kernel/ProgressBaseTest.py | 1 +
.../kernel/PropertyManagerDataServiceTest.py | 1 +
.../kernel/PropertyManagerPropertyTest.py | 2 ++
.../mantid/kernel/PropertyManagerTest.py | 1 +
.../python/mantid/kernel/PythonPluginsTest.py | 1 +
.../test/python/mantid/kernel/QuatTest.py | 1 +
.../python/mantid/kernel/StatisticsTest.py | 1 +
.../kernel/StringContainsValidatorTest.py | 1 +
.../mantid/kernel/TimeSeriesPropertyTest.py | 1 +
.../mantid/kernel/UnitConversionTest.py | 1 +
.../python/mantid/kernel/UnitFactoryTest.py | 1 +
.../python/mantid/kernel/UnitLabelTest.py | 1 +
.../test/python/mantid/kernel/UnitsTest.py | 1 +
.../test/python/mantid/kernel/VMDTest.py | 1 +
.../test/python/mantid/plots/ScalesTest.py | 1 +
.../python/mantid/plots/compatabilityTest.py | 1 +
.../plugins/algorithms/AbinsBasicTest.py | 1 +
.../plugins/algorithms/AlignComponentsTest.py | 1 +
.../AngularAutoCorrelationsSingleAxisTest.py | 1 +
.../AngularAutoCorrelationsTwoAxesTest.py | 1 +
.../plugins/algorithms/CalculateFluxTest.py | 1 +
.../plugins/algorithms/CleanFileCacheTest.py | 2 ++
.../algorithms/ComputeIncoherentDOSTest.py | 1 +
.../plugins/algorithms/ConjoinSpectraTest.py | 1 +
.../plugins/algorithms/CorrectLogTimesTest.py | 1 +
.../plugins/algorithms/CorrectTOFTest.py | 1 +
.../algorithms/CreateCacheFilenameTest.py | 1 +
.../algorithms/CreateLeBailFitInputTest.py | 1 +
.../plugins/algorithms/CreateWorkspaceTest.py | 1 +
.../algorithms/CropWorkspaceForMDNormTest.py | 1 +
.../plugins/algorithms/DSFinterpTest.py | 1 +
.../algorithms/EnggCalibrateFullTest.py | 1 +
.../plugins/algorithms/EnggCalibrateTest.py | 1 +
.../algorithms/EnggVanadiumCorrectionsTest.py | 1 +
.../algorithms/ExportExperimentLogTest.py | 2 ++
.../ExportSampleLogsToCSVFileTest.py | 2 ++
.../algorithms/ExportSpectraMaskTest.py | 2 ++
.../plugins/algorithms/ExtractMonitorsTest.py | 1 +
.../plugins/algorithms/FilterLogByTimeTest.py | 1 +
.../plugins/algorithms/FitGaussianTest.py | 1 +
.../plugins/algorithms/LRPeakSelectionTest.py | 1 +
.../algorithms/LoadEmptyVesuvioTest.py | 1 +
.../algorithms/LoadFullprofFileTest.py | 1 +
.../algorithms/LoadLogPropertyTableTest.py | 1 +
.../plugins/algorithms/LoadMultipleGSSTest.py | 1 +
.../algorithms/LoadNMoldyn3AsciiTest.py | 1 +
.../algorithms/LoadNMoldyn4Ascii1DTest.py | 1 +
.../algorithms/LoadNMoldyn4AsciiTest.py | 1 +
.../algorithms/MaskWorkspaceToCalFileTest.py | 1 +
.../python/plugins/algorithms/MeanTest.py | 1 +
.../plugins/algorithms/MergeCalFilesTest.py | 6 ++++
.../plugins/algorithms/MuscatSofQWTest.py | 1 +
.../algorithms/NormaliseSpectraTest.py | 1 +
.../plugins/algorithms/RetrieveRunInfoTest.py | 1 +
.../plugins/algorithms/SANSSubtractTest.py | 1 +
.../algorithms/SANSWideAngleCorrectionTest.py | 2 ++
.../plugins/algorithms/SaveNexusPDTest.py | 1 +
.../algorithms/SavePlot1DAsJsonTest.py | 1 +
.../SelectNexusFilesByMetadataTest.py | 1 +
.../UpdatePeakParameterTableValueTest.py | 1 +
.../VelocityAutoCorrelationsTest.py | 1 +
.../VelocityCrossCorrelationsTest.py | 1 +
.../algorithms/VesuvioResolutionTest.py | 1 +
.../IndirectResolutionTest.py | 1 +
.../SANSDarkRunBackgroundCorrectionTest.py | 3 ++
.../WorkflowAlgorithms/SANSStitchTest.py | 1 +
.../SimulatedDensityOfStatesTest.py | 1 +
.../WorkflowAlgorithms/SwapWidthsTest.py | 1 +
.../WorkflowAlgorithms/TimeSliceTest.py | 1 +
.../python/plugins/functions/AttributeTest.py | 2 ++
.../plugins/functions/DSFinterp1DFitTest.py | 1 +
.../functions/Example1DFunctionTest.py | 2 ++
.../functions/ExamplePeakFunctionTest.py | 2 ++
.../functions/PrimStretchedExpFTTest.py | 1 +
.../plugins/functions/StretchedExpFTTest.py | 1 +
.../test/testhelpers/__init__.py | 1 +
.../test/testhelpers/algorithm_decorator.py | 1 +
MantidPlot/mantidplot.py | 1 +
MantidPlot/pymantidplot/__init__.py | 1 +
MantidPlot/pymantidplot/proxies.py | 28 +++++++++++++++++
MantidPlot/pymantidplot/qtiplot.py | 2 ++
MantidPlot/test/MantidPlotInputArgsCheck.py | 1 +
MantidPlot/test/mantidplottests.py | 2 ++
.../lib/systemtests/xmlreporter.py | 1 +
.../scripts/performance/analysis.py | 10 +++++++
.../scripts/performance/sqlresults.py | 14 +++++++++
.../CalibrateRectangularDetector_Test.py | 2 ++
.../tests/analysis/ISISDirectInelastic.py | 2 ++
.../tests/analysis/ISISIndirectInelastic.py | 1 +
.../analysis/ISISReflInstrumentIDFTest.py | 2 ++
.../analysis/IndirectDiffractionTests.py | 2 ++
.../tests/analysis/LoadAndCheckBase.py | 2 ++
.../tests/analysis/ReflectometryISIS.py | 2 ++
.../SystemTests/tests/analysis/SortHKLTest.py | 2 ++
.../SpaceGroupReflectionConditionsTest.py | 2 ++
.../tests/analysis/SpaceGroupUnitCellTest.py | 2 ++
.../tests/analysis/SphinxWarnings.py | 2 ++
.../build_tools/SCons/test/eprouvette.py | 13 ++++++++
.../cxxtest/python/cxxtest/cxxtest_parser.py | 27 +++++++++++++++++
.../cxxtest/python/cxxtest/cxxtestgen.py | 30 +++++++++++++++++++
buildconfig/CMake/FindPyQt.py | 2 ++
buildconfig/class_maker.py | 4 +++
buildconfig/cmakelists_utils.py | 4 +++
buildconfig/delete_class.py | 2 ++
buildconfig/move_class.py | 2 ++
.../CompleteGUIcode/model_colour.py | 2 ++
.../CompleteGUIcode/plot_presenter.py | 2 ++
.../MVPTutorial/CompleteGUIcode/presenter.py | 2 ++
.../mantiddoc/directives/algorithm.py | 3 ++
.../mantiddoc/directives/categories.py | 12 ++++++++
.../sphinxext/mantiddoc/directives/diagram.py | 1 +
.../mantiddoc/directives/properties.py | 1 +
.../utils/qt/test/test_qappthreadcall.py | 2 ++
.../widgets/observers/observing_presenter.py | 1 +
.../widgets/observers/observing_view.py | 1 +
.../axestabwidget/__init__.py | 1 +
.../workspacedisplay/table/error_column.py | 2 ++
.../workspacedisplay/table/marked_columns.py | 2 ++
scripts/AbinsModules/GeneralData.py | 2 ++
.../AbinsModules/Instruments/Instrument.py | 2 ++
scripts/Calibration/tube_calib_fit_params.py | 2 ++
scripts/Calibration/tube_spec.py | 1 +
.../isis_powder/gem_routines/gem_enums.py | 2 ++
.../isis_powder/hrpd_routines/hrpd_enums.py | 2 ++
.../isis_powder/pearl_routines/pearl_enums.py | 2 ++
.../polaris_routines/polaris_enums.py | 2 ++
.../isis_powder/routines/yaml_sanity.py | 2 ++
.../tabs/common/calibration_info.py | 2 ++
.../common/cropping/cropping_presenter.py | 2 ++
.../Inelastic/CrystalField/normalisation.py | 2 ++
.../QuickEdit/quickEdit_presenter.py | 2 ++
scripts/MultiPlotting/label.py | 2 ++
.../context_example_presenter.py | 2 ++
.../Muon/GUI/Common/dummy/dummy_presenter.py | 2 ++
.../Common/dummy_label/dummy_label_model.py | 2 ++
.../dummy_label/dummy_label_presenter.py | 2 ++
.../GUI/Common/home_tab/home_tab_model.py | 2 ++
.../Muon/GUI/Common/thread_model_wrapper.py | 2 ++
.../GUI/Common/utilities/muon_test_helpers.py | 2 ++
scripts/Muon/GUI/Common/validate_errors.py | 2 ++
.../Detectors/detectors_presenter.py | 2 ++
.../LineSelector/LineSelectorPresenter.py | 2 ++
.../Peaks/peaks_presenter.py | 2 ++
.../PeakSelector/peak_selector_presenter.py | 2 ++
.../transform_selection_presenter.py | 2 ++
.../Reflectometry/isis_reflectometry/quick.py | 2 ++
scripts/SANS/sans/common/configurations.py | 1 +
scripts/SANS/sans/common/log_tagger.py | 2 ++
scripts/SANS/sans/gui_logic/plotting.py | 2 ++
.../gui_logic/presenter/presenter_common.py | 2 ++
scripts/SCD_Reduction/ReduceDictionary.py | 2 ++
scripts/directtools/_validate.py | 2 ++
scripts/test/Abins/AbinsBroadeningTest.py | 1 +
.../AbinsFrequencyPowderGeneratorTest.py | 1 +
scripts/test/AbsorptionShapesTest.py | 1 +
scripts/test/DirectEnergyConversionTest.py | 2 ++
scripts/test/DirectReductionHelpersTest.py | 1 +
scripts/test/IndirectCommonTests.py | 1 +
scripts/test/Muon/LoadWidgetPresenter_test.py | 1 +
.../elemental_analysis/load_utils_test.py | 2 ++
.../fft_presenter_context_interaction_test.py | 1 +
.../loadrun_presenter_current_run_test.py | 3 ++
scripts/test/Muon/muon_gui_context_test.py | 1 +
scripts/test/ReductionWrapperTest.py | 3 ++
.../test/ReflectometryQuickAuxiliaryTest.py | 1 +
.../SANS/gui_logic/add_runs_presenter_test.py | 1 +
scripts/test/SANSCentreFinderTest.py | 1 +
scripts/test/SANSCommandInterfaceTest.py | 6 ++++
scripts/test/SANSIsisInstrumentTest.py | 1 +
.../test/SANSReductionStepsUserFileTest.py | 3 ++
scripts/test/SANSUtilityTest.py | 20 +++++++++++++
scripts/test/SansIsisGuiSettings.py | 1 +
scripts/test/SettingsTest.py | 4 +++
244 files changed, 520 insertions(+)
diff --git a/Framework/PythonInterface/mantid/kernel/funcinspect.py b/Framework/PythonInterface/mantid/kernel/funcinspect.py
index 5ad989c9abe..285fb8bec50 100644
--- a/Framework/PythonInterface/mantid/kernel/funcinspect.py
+++ b/Framework/PythonInterface/mantid/kernel/funcinspect.py
@@ -18,6 +18,7 @@ import inspect
import sys
import dis
+
def replace_signature(func, signature):
"""
Replace the signature of the given function object with that given by
@@ -74,6 +75,8 @@ def customise_func(func, name, signature, docstring):
return func
#-------------------------------------------------------------------------------
+
+
def decompile(code_object):
"""
Taken from
@@ -128,6 +131,7 @@ __operator_names = set(['CALL_FUNCTION', 'CALL_FUNCTION_VAR', 'CALL_FUNCTION_KW'
'CALL_FUNCTION_EX', 'LOAD_METHOD', 'CALL_METHOD'])
#--------------------------------------------------------------------------------------
+
def process_frame(frame):
"""Returns the number of arguments on the left of assignment along
with the names of the variables for the given frame.
@@ -216,6 +220,7 @@ def process_frame(frame):
#-------------------------------------------------------------------------------
+
def lhs_info(output_type='both', frame=None):
"""Returns the number of arguments on the left of assignment along
with the names of the variables.
diff --git a/Framework/PythonInterface/mantid/kernel/plugins.py b/Framework/PythonInterface/mantid/kernel/plugins.py
index 6e649c6b8ee..168d84ad234 100644
--- a/Framework/PythonInterface/mantid/kernel/plugins.py
+++ b/Framework/PythonInterface/mantid/kernel/plugins.py
@@ -38,6 +38,7 @@ from . import logger, Logger, config
# String that separates paths (should be in the ConfigService)
PATH_SEPARATOR=";"
+
class PluginLoader(object):
extension = ".py"
@@ -68,6 +69,7 @@ class PluginLoader(object):
# High-level functions to assist with loading
#======================================================================================================================
+
def get_plugin_paths_as_set(key):
"""
Returns the value of the given key in the config service
@@ -81,6 +83,7 @@ def get_plugin_paths_as_set(key):
s.remove('')
return s
+
def check_for_plugins(top_dir):
"""
Runs a quick check to see if any plugin files exist in the given directory
@@ -119,6 +122,7 @@ def find_plugins(top_dir):
#======================================================================================================================
+
def load(path):
"""
High-level function to import the module(s) on the given path.
@@ -151,6 +155,7 @@ def load(path):
#======================================================================================================================
+
def load_from_list(paths):
"""
Load all modules in the given list
@@ -168,6 +173,7 @@ def load_from_list(paths):
#======================================================================================================================
+
def load_from_dir(directory):
"""
Load all modules in the given directory
@@ -183,6 +189,7 @@ def load_from_dir(directory):
#======================================================================================================================
+
def load_from_file(filepath):
"""
Loads the plugin file. Any code present at the top-level will
@@ -200,6 +207,7 @@ def load_from_file(filepath):
#======================================================================================================================
+
def load_plugin(plugin_path):
"""
Load a plugin and return the name & module object
@@ -215,6 +223,7 @@ def load_plugin(plugin_path):
#======================================================================================================================
+
def sync_attrs(source, attrs, clients):
"""
Syncs the attribute definitions between the
@@ -234,6 +243,7 @@ def sync_attrs(source, attrs, clients):
#======================================================================================================================
+
def contains_algorithm(filename):
"""
Inspects the file to look for an algorithm registration line
diff --git a/Framework/PythonInterface/mantid/plots/_compatability.py b/Framework/PythonInterface/mantid/plots/_compatability.py
index 9dfd4708bbc..9c6ca66fe14 100644
--- a/Framework/PythonInterface/mantid/plots/_compatability.py
+++ b/Framework/PythonInterface/mantid/plots/_compatability.py
@@ -19,6 +19,8 @@ LOGGER = Logger("mantid.plots.plotCompatability")
# ================================================
# Compatability functions
# ================================================
+
+
def plotSpectrum(workspaces, indices=None, distribution=None, error_bars=False,
type=None, window=None, clearWindow=None,
waterfall=None, spectrum_nums=None):
diff --git a/Framework/PythonInterface/mantid/plots/mantidaxes.py b/Framework/PythonInterface/mantid/plots/mantidaxes.py
index 7f529092e65..5ca0b07533f 100644
--- a/Framework/PythonInterface/mantid/plots/mantidaxes.py
+++ b/Framework/PythonInterface/mantid/plots/mantidaxes.py
@@ -35,6 +35,8 @@ WATERFALL_XOFFSET_DEFAULT, WATERFALL_YOFFSET_DEFAULT = 10, 20
# -----------------------------------------------------------------------------
# Decorators
# -----------------------------------------------------------------------------
+
+
def plot_decorator(func):
def wrapper(self, *args, **kwargs):
func_value = func(self, *args, **kwargs)
@@ -56,6 +58,8 @@ def plot_decorator(func):
# -----------------------------------------------------------------------------
# MantidAxes
# -----------------------------------------------------------------------------
+
+
class MantidAxes(Axes):
"""
This class defines the **mantid** projection for 2d plotting. One chooses
@@ -1101,6 +1105,8 @@ class MantidAxes(Axes):
# -----------------------------------------------------------------------------
# MantidAxes3D
# -----------------------------------------------------------------------------
+
+
class MantidAxes3D(Axes3D):
"""
This class defines the **mantid3d** projection for 3d plotting. One chooses
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index 4138bc24bf0..5a006ecbafd 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -40,6 +40,8 @@ MARKER_MAP = {'square': 's', 'plus (filled)': 'P', 'point': '.', 'tickdown': 3,
# -----------------------------------------------------------------------------
# Decorators
# -----------------------------------------------------------------------------
+
+
def manage_workspace_names(func):
"""
A decorator to go around plotting functions.
@@ -81,6 +83,7 @@ def figure_title(workspaces, fig_num):
return wsname(first) + '-' + str(fig_num)
+
@manage_workspace_names
def plot(workspaces, spectrum_nums=None, wksp_indices=None, errors=False,
overplot=False, fig=None, plot_kwargs=None, ax_properties=None,
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
index 5210878677f..838f086cf36 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
@@ -10,6 +10,8 @@ from mantid.kernel import *
from distutils.version import LooseVersion
import numpy as np
import os
+
+
class ExportSampleLogsToCSVFile(PythonAlgorithm):
""" Python algorithm to export sample logs to spread sheet file
for VULCAN
diff --git a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
index b19b7e3ec6c..a7398ba6d9c 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRAutoReduction.py
@@ -20,6 +20,8 @@ from mantid.simpleapi import *
from mantid.kernel import *
from reduction_gui.reduction.reflectometer.refl_data_series import DataSeries
from reduction_gui.reduction.reflectometer.refl_data_script import DataSets
+
+
class LRAutoReduction(PythonAlgorithm):
def category(self):
diff --git a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
index 2b13fc66e16..6d4a809baa8 100644
--- a/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
+++ b/Framework/PythonInterface/plugins/algorithms/LRScalingFactors.py
@@ -10,6 +10,8 @@ import re
from mantid.api import *
from mantid.simpleapi import *
from mantid.kernel import *
+
+
class LRScalingFactors(PythonAlgorithm):
"""
This algorithm runs through a sequence of direct beam data sets
diff --git a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
index ec351ef7a70..c3f79a6f6cb 100644
--- a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
@@ -12,6 +12,7 @@ from mantid import config
import os
from itertools import filterfalse
+
class Intervals(object):
# Having "*intervals" as a parameter instead of "intervals" allows us
# to type "Intervals( (0,3), (6, 8) )" instead of "Intervals( ( (0,3), (6, 8) ) )"
diff --git a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
index b0078ced8b3..51027b1c8cc 100644
--- a/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
+++ b/Framework/PythonInterface/plugins/algorithms/SelectNexusFilesByMetadata.py
@@ -9,6 +9,7 @@ from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
+
class SelectNexusFilesByMetadata(PythonAlgorithm):
_criteria_splitted = []
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
index c6ba2c2771a..d9f1b4ee8ad 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSDFit.py
@@ -8,6 +8,8 @@
from mantid.simpleapi import *
from mantid.api import *
from mantid.kernel import *
+
+
class MSDFit(DataProcessorAlgorithm):
_output_fit_ws = None
_model = None
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
index f4ab04871f6..483ad5a0619 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
@@ -9,6 +9,8 @@ from mantid.api import *
from mantid.kernel import *
import os
import sys
+
+
def simple_algorithm(algorithm_str, parameters):
return _execute(algorithm_str, parameters)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
index e9e3110f365..3d51e45d14f 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/USANSReduction.py
@@ -13,6 +13,8 @@ import numpy
import sys
import os
import json
+
+
class USANSReduction(PythonAlgorithm):
wl_list = None
diff --git a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
index 6c36eeae2ec..edc6ef04ab7 100644
--- a/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
+++ b/Framework/PythonInterface/test/python/mantid/ImportModuleTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import AlgorithmFactory
+
class ImportModuleTest(unittest.TestCase):
def test_import_succeeds(self):
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
index bdba68e6fd7..229b6646acd 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIFitTest.py
@@ -18,6 +18,7 @@ from mantid.api import mtd, MatrixWorkspace, ITableWorkspace, IFunction
import numpy as np
from testhelpers import run_algorithm
+
class SimpleAPIFitTest(unittest.TestCase):
_raw_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
index ce4efeea51e..9a6b71ad716 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPILoadTest.py
@@ -11,6 +11,7 @@ import unittest
from mantid.simpleapi import Load, LoadDialog
from mantid.api import mtd, MatrixWorkspace, WorkspaceGroup
+
class SimpleAPILoadTest(unittest.TestCase):
def tearDown(self):
diff --git a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
index 8fb4c8853c2..56796257609 100644
--- a/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/SimpleAPIRenameWorkspaceTest.py
@@ -13,6 +13,7 @@ import platform
from mantid.api import mtd
from mantid.simpleapi import CreateSampleWorkspace,RenameWorkspace
+
class SimpleAPIRenameWorkspaceTest(unittest.TestCase):
_raw_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
index c32ad8c3b9a..75119671ac1 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmHistoryTest.py
@@ -9,6 +9,8 @@ from mantid.simpleapi import CreateWorkspace, set_properties
from mantid.api import (MatrixWorkspaceProperty, AlgorithmFactory, AlgorithmManager,
DataProcessorAlgorithm, PythonAlgorithm)
from mantid.kernel import Direction
+
+
class ChildAlg(PythonAlgorithm):
def PyInit(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
index def1ea60fa2..8d1a2fe044a 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AlgorithmTest.py
@@ -10,6 +10,7 @@ import json
from mantid.api import AlgorithmID, AlgorithmManager, FrameworkManagerImpl
from testhelpers import run_algorithm
+
class AlgorithmTest(unittest.TestCase):
_load = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
index bc09f589676..e1da231febf 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AxisTest.py
@@ -9,6 +9,7 @@ from testhelpers import run_algorithm
from mantid.api import NumericAxis, SpectraAxis, TextAxis, mtd
import numpy as np
+
class AxisTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
index 08959d1007e..e71bc88579f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/DataProcessorAlgorithmTest.py
@@ -10,6 +10,7 @@ from mantid.api import (Algorithm, DataProcessorAlgorithm, AlgorithmFactory,
AlgorithmManager, WorkspaceProperty)
from mantid.kernel import Direction
+
class TestDataProcessor(DataProcessorAlgorithm):
def PyInit(self):
pass
@@ -17,6 +18,7 @@ class TestDataProcessor(DataProcessorAlgorithm):
pass
# end v1 alg
+
class DataProcessorAlgorithmTest(unittest.TestCase):
def test_DataProcessorAlgorithm_instance_inherits_Algorithm(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
index a8cbe57861f..f6156e22315 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ExperimentInfoTest.py
@@ -14,6 +14,7 @@ from mantid.geometry import Instrument
from mantid.api import Sample, Run
from math import pi
+
class ExperimentInfoTest(unittest.TestCase):
_expt_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
index 28aeff02d09..31072941983 100644
--- a/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/FrameworkManagerTest.py
@@ -8,6 +8,7 @@ import unittest
import testhelpers
from mantid.api import FrameworkManager, FrameworkManagerImpl, IAlgorithm, AlgorithmProxy
+
class FrameworkManagerTest(unittest.TestCase):
def test_clear_functions_do_not_throw(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
index cb4ef3f5521..37a340132f1 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IEventWorkspaceTest.py
@@ -11,6 +11,7 @@ from testhelpers import run_algorithm, can_be_instantiated, WorkspaceCreationHel
from mantid.api import (IEventWorkspace, IEventList, IWorkspaceProperty,
AlgorithmManager)
+
class IEventWorkspaceTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
index 3c0bd67f9b0..6b5b35fda06 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IMaskWorkspaceTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import AnalysisDataService, IMaskWorkspace
from testhelpers import run_algorithm, WorkspaceCreationHelper
+
class IMaskWorkspaceTest(unittest.TestCase):
def test_MaskWorkspace_Is_Retrievable(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
index 13487961b0e..f19141d09cc 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeakFunctionTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import *
import numpy as np
+
class MyPeak(IPeakFunction):
def init(self):
@@ -18,6 +19,7 @@ class MyPeak(IPeakFunction):
def functionLocal(self, xvals):
return 5*xvals
+
class RectangularFunction(IPeakFunction):
def init(self):
self.declareParameter("Height")
@@ -53,6 +55,7 @@ class RectangularFunction(IPeakFunction):
return values
+
class IPeakFunctionTest(unittest.TestCase):
def test_instance_can_be_created_standalone(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
index 49b08f6a65f..558c691e4d4 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ITableWorkspaceTest.py
@@ -11,6 +11,7 @@ from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory
from mantid.dataobjects import TableWorkspace
import numpy
+
class ITableWorkspaceTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
index 242376669d5..bcc8bdc8c36 100644
--- a/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/JacobianTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.api import Jacobian
+
class JacobianTest(unittest.TestCase):
def test_class_has_expected_attrs(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
index 0e9304cfd52..6c92b7e6e6c 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
@@ -9,6 +9,7 @@ from testhelpers import run_algorithm
from mantid import mtd
import mantid
+
class MDEventWorkspaceTest(unittest.TestCase):
"""
Test the interface to MDEventWorkspaces
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
index 65e8d80d7e9..56c9285e83f 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDGeometryTest.py
@@ -13,6 +13,7 @@ import unittest
from testhelpers import WorkspaceCreationHelper
+
class MDGeometryTest(unittest.TestCase):
_test_ndims = 4
diff --git a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
index 20ca8badeaa..dbb44943d45 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MatrixWorkspaceTest.py
@@ -14,6 +14,8 @@ from mantid.geometry import Detector
from mantid.kernel import Direction, V3D
from mantid.simpleapi import CreateSampleWorkspace, Rebin
import numpy as np
+
+
class MatrixWorkspaceTest(unittest.TestCase):
_test_ws_prop = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
index fc04e994294..c69b7180bd8 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleExperimentInfos.py
@@ -8,6 +8,7 @@ import unittest
from testhelpers import WorkspaceCreationHelper
from mantid.api import ExperimentInfo
+
class MultipleExperimentInfoTest(unittest.TestCase):
def test_information_access(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
index 3ec4742a006..84e0d8135dd 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MultipleFilePropertyTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import MultipleFileProperty, mtd
from testhelpers import create_algorithm
+
class MultipleFilePropertyTest(unittest.TestCase):
def tearDown(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
index 58fd5ee8d98..95837d03cbd 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProgressTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import Progress,PythonAlgorithm
from mantid.kernel import ProgressBase
+
class ProgressTest(unittest.TestCase):
def test_class_inherits_ProgressBase(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
index 632ad1864a4..63c0c8dff74 100644
--- a/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/ProjectionTest.py
@@ -10,6 +10,7 @@ from mantid.kernel import V3D
from mantid.simpleapi import mtd
import numpy as np
+
class ProjectionTest(unittest.TestCase):
def test_constructors(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
index f3d0cb90424..055237ecdf1 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmTraitsTest.py
@@ -15,6 +15,7 @@ from mantid.api import (PythonAlgorithm, AlgorithmProxy, Algorithm, IAlgorithm,
########################### Test classes #####################################
+
class TestPyAlgDefaultAttrs(PythonAlgorithm):
def PyInit(self):
pass
@@ -22,6 +23,7 @@ class TestPyAlgDefaultAttrs(PythonAlgorithm):
def PyExec(self):
pass
+
class TestPyAlgOverriddenAttrs(PythonAlgorithm):
def version(self):
@@ -42,6 +44,7 @@ class TestPyAlgOverriddenAttrs(PythonAlgorithm):
def PyExec(self):
pass
+
class TestPyAlgIsRunningReturnsNonBool(PythonAlgorithm):
def isRunning(self):
@@ -53,6 +56,7 @@ class TestPyAlgIsRunningReturnsNonBool(PythonAlgorithm):
def PyExec(self):
pass
+
class CancellableAlg(PythonAlgorithm):
is_running = True
@@ -71,6 +75,7 @@ class CancellableAlg(PythonAlgorithm):
###############################################################################
+
class PythonAlgorithmTest(unittest.TestCase):
_registered = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
index 1fb1f764eb4..cab633f7aa6 100644
--- a/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/PythonAlgorithmWorkspacePropertyTest.py
@@ -11,6 +11,7 @@ import unittest
from mantid.api import PythonAlgorithm, WorkspaceProperty
from mantid.kernel import Direction
+
class PythonAlgorithmWorkspacePropertyTest(unittest.TestCase):
def _do_test(self, classtype):
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
index 36c3b873218..9b2ef32e9ae 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunPythonScriptTest.py
@@ -13,6 +13,7 @@ from mantid.simpleapi import *
from testhelpers import WorkspaceCreationHelper
+
class RunPythonScriptTest(unittest.TestCase):
"""
Try out RunPythonScript
diff --git a/Framework/PythonInterface/test/python/mantid/api/RunTest.py b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
index 34a9e52b75a..1bbe8fedc23 100644
--- a/Framework/PythonInterface/test/python/mantid/api/RunTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/RunTest.py
@@ -11,6 +11,7 @@ from mantid.kernel import DateAndTime, FloatTimeSeriesProperty
from mantid.api import Run
import numpy as np
+
class RunTest(unittest.TestCase):
_expt_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
index 0d23a2d9951..7c3fc864518 100644
--- a/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/SpectrumInfoTest.py
@@ -9,6 +9,7 @@ from testhelpers import WorkspaceCreationHelper
from mantid.kernel import V3D
from mantid.api import SpectrumDefinition
+
class SpectrumInfoTest(unittest.TestCase):
_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
index b53574c97c3..8e164f9d5e3 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceFactoryTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import (WorkspaceFactory, WorkspaceFactoryImpl, MatrixWorkspace,
ITableWorkspace, IPeaksWorkspace)
+
class WorkspaceFactoryTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
index 3bb56e80c62..29f03aa73da 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspacePropertiesTest.py
@@ -15,6 +15,7 @@ from mantid.api import (WorkspaceProperty, WorkspaceGroupProperty, MatrixWorkspa
PropertyMode, LockMode)
from mantid.kernel import Direction, Property
+
class WorkspacePropertiesTest(unittest.TestCase):
def _do_test(self, classtype):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
index 118e84fa876..6a074e903a9 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceTest.py
@@ -8,6 +8,7 @@ import unittest
from testhelpers import run_algorithm
from mantid.api import Workspace
+
class WorkspaceTest(unittest.TestCase):
def test_that_one_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
index cb8dca1b767..41838c08107 100644
--- a/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/WorkspaceValidatorsTest.py
@@ -16,6 +16,7 @@ from mantid.api import (WorkspaceUnitValidator, HistogramValidator,
InstrumentValidator, MDFrameValidator,
OrientedLatticeValidator)
+
class WorkspaceValidatorsTest(unittest.TestCase):
def test_WorkspaceUnitValidator_construction(self):
diff --git a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
index df5032a6f32..d54bb2774a5 100644
--- a/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
+++ b/Framework/PythonInterface/test/python/mantid/dataobjects/EventListTest.py
@@ -14,6 +14,7 @@ from mantid.dataobjects import EventList
gps_epoch_plus_42_nanoseconds = np.datetime64('1990-01-01T00:00:00.000000042Z', 'ns')
+
class EventListTest(unittest.TestCase):
def createRandomEventList(self, length):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
index b3e71c8ab73..f4c046865ec 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/BoundingBoxTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.geometry import BoundingBox
from mantid.kernel import V3D
+
class BoundingBoxTest(unittest.TestCase):
def test_default_construction_is_allowed(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
index 27ca0e107fa..dc6e2937715 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ComponentInfoTest.py
@@ -14,6 +14,7 @@ from mantid.geometry import CSGObject
from mantid.simpleapi import *
from itertools import islice
+
class ComponentInfoTest(unittest.TestCase):
_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
index c496dcbefe0..9ee6ccc306f 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/GoniometerTest.py
@@ -11,6 +11,7 @@ from testhelpers import can_be_instantiated
from testhelpers import run_algorithm
import numpy as np
+
class GoniometerTest(unittest.TestCase):
def test_Goniometer_can_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
index c16f38e3c4f..32232d4495b 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/IComponentTest.py
@@ -8,6 +8,7 @@ import unittest
from testhelpers import can_be_instantiated
from mantid.geometry import IComponent
+
class IComponentTest(unittest.TestCase):
def test_IComponent_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
index a9f0b63be31..133732fa9a5 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
@@ -10,6 +10,7 @@ from mantid.geometry import OrientedLattice, UnitCell
from mantid.kernel import V3D
import numpy as np
+
class OrientedLatticeTest(unittest.TestCase):
def test_OrientedLattice_is_subclass_of_UnitCell(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
index 556b4c4aac5..e6b05f1e6c2 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import CreatePeaksWorkspace, CreateSampleWorkspace
from mantid.geometry import PeakShape
+
class PeakShapeTest(unittest.TestCase):
def test_basic_access(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
index 2e6e1d5fe88..72fd241dfe6 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/RectangularDetectorTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.geometry import *
from testhelpers import can_be_instantiated, WorkspaceCreationHelper
+
class RectangularDetectorTest(unittest.TestCase):
def test_RectangularDetector_cannot_be_instantiated(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
index ffca2a01ac7..f9c09cd02d0 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/ReferenceFrameTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.geometry import ReferenceFrame
+
class ReferenceFrameTest(object):
def test_ReferenceFrame_cannot_be_instantiated(self):
self.assertFalse(can_be_instantiated(Instrument))
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
index 8199d793e10..010c64ab613 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryElementTest.py
@@ -9,6 +9,7 @@ from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.geometry import SymmetryElement, SymmetryElementFactory
from mantid.kernel import V3D
+
class SymmetryElementTest(unittest.TestCase):
def test_creation_axis(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
index 76a8250e9fe..1df03bcb0cd 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.geometry import SymmetryOperation, SymmetryOperationFactory
from mantid.kernel import V3D
+
class SymmetryOperationTest(unittest.TestCase):
def test_creation(self):
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
index 34f3aebce16..4b30d412833 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/UnitCellTest.py
@@ -10,6 +10,7 @@ from mantid.geometry import UnitCell, AngleUnits
from mantid.kernel import V3D
import numpy as np
+
class UnitCellTest(unittest.TestCase):
def test_invalid_parameters_throw(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
index 721f7b2c888..b938bf4d590 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayBoundedValidatorTest.py
@@ -10,6 +10,7 @@ import testhelpers
from mantid.kernel import FloatArrayBoundedValidator, FloatArrayProperty
from mantid.api import PythonAlgorithm
+
class ArrayBoundedValidatorTest(unittest.TestCase):
def test_empty_constructor_gives_no_lower_upper_bound_set(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
index d5695c5e8c7..16016c114b7 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayLengthValidatorTest.py
@@ -10,6 +10,7 @@ import testhelpers
from mantid.kernel import FloatArrayLengthValidator, FloatArrayProperty
from mantid.api import PythonAlgorithm
+
class ArrayLengthValidatorTest(unittest.TestCase):
def test_empty_constructor_has_no_lengths_set(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
index 4baebf00cb7..2ec4f20472f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ArrayPropertyTest.py
@@ -13,6 +13,7 @@ from mantid.api import PythonAlgorithm
import numpy as np
import sys
+
class ArrayPropertyTest(unittest.TestCase):
def test_default_constructor_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
index 6446ab2e5f2..0e5c9088ec3 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/BoundedValidatorTest.py
@@ -8,6 +8,7 @@ import unittest
import testhelpers
from mantid.kernel import FloatBoundedValidator, IntBoundedValidator
+
class BoundedValidatorTest(unittest.TestCase):
def test_construction_does_not_raise_error_when_both_are_floats(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
index 85b7a5d8e16..9369302d9c6 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/CompositeValidatorTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import CompositeValidator, CompositeRelation, FloatBoundedValidator
from mantid.api import PythonAlgorithm
+
class CompositeValidatorTest(unittest.TestCase):
def test_creation_with_add_succeeds_correctly_in_algorithm(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index 565c302d393..ac0392a45d1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -11,6 +11,8 @@ import unittest
from mantid.kernel import (ConfigService, ConfigServiceImpl, config,
std_vector_str, FacilityInfo, InstrumentInfo)
+
+
class ConfigServiceTest(unittest.TestCase):
__dirs_to_rm = []
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
index 75544bc6f2f..b87521d9d39 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/DeltaEModeTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import DeltaEMode, DeltaEModeType
+
class DeltaEModeTest(unittest.TestCase):
def test_availableTypes_contains_three_modes(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
index 3d940a29fea..94407c95597 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FacilityInfoTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import FacilityInfo, InstrumentInfo, ConfigService
import pytz
+
class FacilityInfoTest(unittest.TestCase):
def test_construction_raies_an_error(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
index 0708f4fea84..aeb5508666b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/FilteredTimeSeriesPropertyTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import BoolTimeSeriesProperty, FloatTimeSeriesProperty, FloatFilteredTimeSeriesProperty
+
class FilteredTimeSeriesPropertyTest(unittest.TestCase):
_source = None
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
index 3802a3b95d5..d77d507d229 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/IPropertySettingsTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import IPropertySettings
+
class IPropertySettingsTest(unittest.TestCase):
def test_construction_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
index bad945c58bd..dca07e07a7f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ListValidatorTest.py
@@ -10,6 +10,7 @@ import testhelpers
from mantid.kernel import StringListValidator, Direction
from mantid.api import PythonAlgorithm
+
class ListValidatorTest(unittest.TestCase):
def test_empty_ListValidator_allows_nothing(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
index 93525c81cd1..6e25b79daf5 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MandatoryValidatorTest.py
@@ -9,6 +9,7 @@ import testhelpers
from mantid.kernel import FloatArrayProperty, StringMandatoryValidator, FloatArrayMandatoryValidator
from mantid.api import PythonAlgorithm
+
class MandatoryValidatorTest(unittest.TestCase):
def test_constructor_does_not_raise_error(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
index c95e18d634a..4e8063d6fef 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/MemoryStatsTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import MemoryStats
import sys
+
class MemoryStatsTest(unittest.TestCase):
def test_values_are_all_greater_than_zero(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
index 41b6df0e323..ffcf7430416 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/NullValidatorTest.py
@@ -8,6 +8,7 @@ import unittest
import testhelpers
from mantid.kernel import NullValidator
+
class NullValidatorTest(unittest.TestCase):
def test_NullValidator_can_be_default_constructed(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
index 43c4043d62a..4207537d8ae 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import Direction, OptionalBool, OptionalBoolValue, OptionalBoolPropertyWithValue
+
class OptionalBoolTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
index 19a394e7fc6..e6cf41d6e14 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ProgressBaseTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import ProgressBase
+
class ProgressBaseTest(unittest.TestCase):
def test_class_has_expected_attributes(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
index f4540fd9ee5..e9d61188707 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerDataServiceTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import PropertyManager, PropertyManagerDataService
+
class PropertyManagerDataServiceTest(unittest.TestCase):
def test_add_existing_mgr_object(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
index 2cfb9c21ecf..99404299d89 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerPropertyTest.py
@@ -11,6 +11,7 @@ from mantid.kernel import PropertyManagerProperty, Direction, PropertyManager
from mantid.api import Algorithm
import numpy as np
+
class FakeAlgorithm(Algorithm):
def PyInit(self):
self.declareProperty(PropertyManagerProperty("Args"))
@@ -18,6 +19,7 @@ class FakeAlgorithm(Algorithm):
def PyExec(self):
pass
+
class PropertyManagerPropertyTest(unittest.TestCase):
def test_default_constructor_raises_an_exception(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
index bc3c79cf3fd..49a0f11ee75 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PropertyManagerTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import PropertyManager, IPropertyManager
+
class PropertyManagerTest(unittest.TestCase):
def test_propertymanager_population(self):
manager = PropertyManager()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
index 9f4a36eaf2b..ae9f82ac372 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/PythonPluginsTest.py
@@ -26,6 +26,7 @@ class TestPyAlg(PythonAlgorithm):
AlgorithmFactory.subscribe(TestPyAlg)
"""
+
class PythonPluginsTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
index cf37a728dba..7a7c6a150b1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
@@ -9,6 +9,7 @@ import math
from mantid.kernel import Quat, V3D
+
class QuatTest(unittest.TestCase):
def test_empty_constructor(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
index 1444d5fd303..94365725dfe 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StatisticsTest.py
@@ -11,6 +11,7 @@ import numpy
DELTA_PLACES = 10
+
class StatisticsTest(unittest.TestCase):
def test_getStatistics_with_floats(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
index 0dcab12e2fc..279c9eb4f37 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/StringContainsValidatorTest.py
@@ -10,6 +10,7 @@ import testhelpers
from mantid.kernel import StringContainsValidator
from mantid.api import PythonAlgorithm
+
class StringContainsValidatorTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
index 91f069b64ee..24012d36d8d 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/TimeSeriesPropertyTest.py
@@ -11,6 +11,7 @@ from mantid.kernel import (DateAndTime, BoolTimeSeriesProperty, FloatTimeSeriesP
StringTimeSeriesProperty)
from testhelpers import run_algorithm
+
class TimeSeriesPropertyTest(unittest.TestCase):
_test_ws = None
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
index 3613cb4f2c8..4b8ebf717e1 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitConversionTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import UnitConversion, DeltaEModeType
import math
+
class UnitConversionTest(unittest.TestCase):
def test_run_accepts_string_units(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
index 8c9024c11dc..6480972de6f 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitFactoryTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.kernel import UnitFactory, UnitFactoryImpl, Unit
+
class UnitFactoryTest(unittest.TestCase):
def test_alias_is_of_type_UnitFactoryImpl(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
index ff25d20fad3..4f8e3e39d1c 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitLabelTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import UnitFactory, UnitLabel
import sys
+
class UnitLabelTest(unittest.TestCase):
def test_UnitLabel_can_be_built_from_simple_string(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
index 26e9dafe79e..644688af6a3 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/UnitsTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.kernel import UnitFactory, Unit, Label, UnitLabel
import types
+
class UnitsTest(unittest.TestCase):
def test_Label_is_returned_from_Factory(self):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
index fc5253f40b1..6e349ee3458 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/VMDTest.py
@@ -8,6 +8,7 @@ from mantid.kernel import VMD
import math
import unittest
+
class VMDTest(unittest.TestCase):
def test_default_construction_gives_object_with_single_dimension(self):
diff --git a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
index e3e72437072..417ed116c12 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/ScalesTest.py
@@ -18,6 +18,7 @@ from mantid.plots.scales import PowerScale, SquareScale
import numpy as np
import testhelpers
+
class ScalesTest(unittest.TestCase):
def test_power_scale_registered_in_factory(self):
diff --git a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
index 030665e0ad3..2473d2ae351 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
@@ -21,6 +21,7 @@ from mantid.py3compat.mock import patch
from mantid.plots._compatability import plotSpectrum, plotBin
from mantid.plots.utility import MantidAxType
+
class compatabilityTest(unittest.TestCase):
@patch('mantid.plots._compatability.plot')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
index 6bb02c6ecb9..ccae62072b5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AbinsBasicTest.py
@@ -12,6 +12,7 @@ from AbinsModules import AbinsConstants, AbinsTestHelpers
import numpy as np
from numpy.testing import assert_array_almost_equal
+
class AbinsBasicTest(unittest.TestCase):
_si2 = "Si2-sc_Abins"
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
index 6a5f228e017..ec7e8d91237 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AlignComponentsTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import AlignComponents, CreateSampleWorkspace, MoveInstrumentComponent, CreateEmptyTableWorkspace, mtd, RotateInstrumentComponent
from mantid.api import AlgorithmFactory
+
class AlignComponentsTest(unittest.TestCase):
def testAlignComponentsPositionXY(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
index 4bc6d7e8e1e..69bbe7e95c3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
@@ -8,6 +8,7 @@ import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsSingleAxis
+
class AngularAutoCorrelationsSingleAxisTest(unittest.TestCase):
def test_simple(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
index f2c74a3159f..6a8a456de61 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
@@ -8,6 +8,7 @@ import unittest
import mantid
from mantid.simpleapi import AngularAutoCorrelationsTwoAxes
+
class AngularAutoCorrelationsTwoAxesTest(unittest.TestCase):
def test_simple(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
index 8c4881e9adc..8ad3693d017 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CalculateFluxTest.py
@@ -9,6 +9,7 @@ from mantid.simpleapi import CalculateFlux, CreateSampleWorkspace, FindDetectors
import numpy as np
import testhelpers
+
class CalculateFluxTest(unittest.TestCase):
pixels_in_shape = 0
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
index 952637ae021..06bd6b9594b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CleanFileCacheTest.py
@@ -14,6 +14,7 @@ from mantid.simpleapi import CreateCacheFilename
import os, sys, hashlib, tempfile, glob, shutil, time
+
class CleanFileCache(unittest.TestCase):
def test1(self):
@@ -163,6 +164,7 @@ def computeTime(daysbefore):
"compute time as float of the time at n=daysbefore days before today"
return time.time() - daysbefore * 24*60*60
+
def touch(f):
with open(f, 'w') as stream:
stream.write('\n')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
index d535fa80355..50436957cb9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ComputeIncoherentDOSTest.py
@@ -12,6 +12,7 @@ from numpy import testing
from scipy import constants
import testhelpers
+
class ComputeIncoherentDOSTest(unittest.TestCase):
def createPhononWS(self, T, en, e_units):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
index a9c56cd90c2..3e209e54c2d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ConjoinSpectraTest.py
@@ -10,6 +10,7 @@ from mantid.kernel import *
from mantid.api import *
from testhelpers import run_algorithm
+
class ConjoinSpectraTest(unittest.TestCase):
_aWS= None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
index fe65ce75e1e..a22b14b094b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectLogTimesTest.py
@@ -10,6 +10,7 @@ from mantid.api import *
from testhelpers import *
from numpy import *
+
class CorrectLogTimesTest(unittest.TestCase):
def testCLTWrongLog(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
index 9adf08f1dd6..566afbe3877 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CorrectTOFTest.py
@@ -11,6 +11,7 @@ from mantid.api import AnalysisDataService, WorkspaceGroup
from scipy.constants import h, m_n, eV
import numpy as np
+
class CorrectTOFTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
index 4393459cfca..76f09c16e4f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateCacheFilenameTest.py
@@ -12,6 +12,7 @@ from testhelpers import run_algorithm
import os, mantid, hashlib
+
class CreateCacheFilename(unittest.TestCase):
def test1(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
index 9fe2d47b92f..844b28d2d1e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateLeBailFitInputTest.py
@@ -12,6 +12,7 @@ from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
+
class CreateLeBailFitInputTest(unittest.TestCase):
def test_LoadHKLFile(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
index a79439c21fe..a4e3e58d1ba 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CreateWorkspaceTest.py
@@ -10,6 +10,7 @@ from mantid.simpleapi import CreateWorkspace
from testhelpers import run_algorithm
import numpy as np
+
class CreateWorkspaceTest(unittest.TestCase):
def test_create_with_1D_numpy_array(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
index 3d7bb861fd1..f0535ac9886 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/CropWorkspaceForMDNormTest.py
@@ -7,6 +7,7 @@
import unittest,os
from mantid.simpleapi import CreateSampleWorkspace, CropWorkspaceForMDNorm
+
class CropWorkspaceForMDNormTest(unittest.TestCase):
def test_simple(self):
ws_in = CreateSampleWorkspace(WorkspaceType='Event',
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
index 04e94219bcd..49566067fd4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/DSFinterpTest.py
@@ -10,6 +10,7 @@ import numpy
import pdb
from mantid.kernel import logger
+
class DSFinterpTest(unittest.TestCase):
def generateWorkspaces(self, nf):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
index fdd1da0de6b..b31dcd8801d 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateFullTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class EnggCalibrateFullTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
index 9bb4c0b7519..637e3f816b0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggCalibrateTest.py
@@ -9,6 +9,7 @@ import unittest
from mantid.api import *
import mantid.simpleapi as sapi
+
class EnggCalibrateTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
index 4d3fbffad26..59ae09c40f5 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/EnggVanadiumCorrectionsTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.api import *
import mantid.simpleapi as sapi
+
class EnggVanadiumCorrectionsTest(unittest.TestCase):
_data_ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index 60d429cb5e1..667d9c27839 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -13,6 +13,8 @@ import mantid.kernel as kernel
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
+
+
class ExportExperimentLogTest(unittest.TestCase):
def test_exportFileNew(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
index 42e9b13c607..01d69188487 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSampleLogsToCSVFileTest.py
@@ -11,6 +11,8 @@ from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
import os
from distutils.version import LooseVersion
+
+
class ExportVulcanSampleLogTest(unittest.TestCase):
def test_exportFileOnly(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
index b0f6b84b84f..c8ea94f83ad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportSpectraMaskTest.py
@@ -10,6 +10,8 @@ import numpy as np
import unittest
import mantid
from mantid.simpleapi import ExportSpectraMask,DeleteWorkspace
+
+
class ExportSpectraMaskTest(unittest.TestCase):
def __init__(self,method_name):
unittest.TestCase.__init__(self,method_name)
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
index 8d6a437cc04..829f6cfb498 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExtractMonitorsTest.py
@@ -7,6 +7,7 @@
import unittest
from mantid.simpleapi import *
+
class ExtractMonitorsTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
index a76bc338ef2..213c0f8b08a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
@@ -10,6 +10,7 @@ from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
+
class FilterLogByTimeTest(unittest.TestCase):
__ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
index 893384bfe24..2f2841fda03 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FitGaussianTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import FitGaussian, CreateSampleWorkspace, DeleteWorkspace
import logging
+
class FitGaussianTest(unittest.TestCase):
def setUp(self):
self.ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
index 3ece6adf16a..74b7773f1a6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LRPeakSelectionTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import LRPeakSelection, CreateSampleWorkspace, DeleteWorkspace
import logging
+
class LRPeakSelectionTest(unittest.TestCase):
def setUp(self):
self.ws = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
index 00bd8eefa79..de38ee79e08 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadEmptyVesuvioTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class LoadEmptyVesuvioTest(unittest.TestCase):
def test_load_empty_no_par_file(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
index ebcc8cfb6e3..bd21c998489 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadFullprofFileTest.py
@@ -13,6 +13,7 @@ from mantid.api import AnalysisDataService
import os
+
class LoadFullprofFileTest(unittest.TestCase):
def test_LoadHKLFile(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
index 0a8a07fa507..594dbdf5954 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLogPropertyTableTest.py
@@ -13,6 +13,7 @@ from mantid.api import AnalysisDataService
import os
+
class LoadLogPropertyTableTest(unittest.TestCase):
def test_LoadValidFilesComments(self):
outputWorskapceName = "LoadLogPropertyTableTest_Test1"
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
index 6a410fec5cd..47d81ca3dd4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadMultipleGSSTest.py
@@ -8,6 +8,7 @@ import unittest
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
+
class LoadMultipleGSSTest(unittest.TestCase):
def test_LoadMultipleGSSTest(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
index 276cc805792..abef8c1f4a9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn3AsciiTest.py
@@ -9,6 +9,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class LoadNMoldyn3AsciiTest(unittest.TestCase):
_cdl_filename = 'NaF_DISF.cdl'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
index d87ed16bba3..7f63c04302c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4Ascii1DTest.py
@@ -10,6 +10,7 @@ from mantid.api import *
import os
import math
+
class LoadNMoldyn4Ascii1DTest(unittest.TestCase):
def setUp(self):
data_dirs = config['datasearch.directories'].split(';')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
index b2110e3e036..eaec78aaf98 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadNMoldyn4AsciiTest.py
@@ -11,6 +11,7 @@ from mantid.api import *
import os
+
class LoadNMoldyn4AsciiTest(unittest.TestCase):
"""
Note that the test files used here are not axactly in the same format as
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
index 4017020d11d..82caa0f6013 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MaskWorkspaceToCalFileTest.py
@@ -11,6 +11,7 @@ from mantid.api import *
from mantid.simpleapi import *
from testhelpers import run_algorithm
+
class MaskWorkspaceToCalFileTest(unittest.TestCase):
def get_masking_for_index(self, cal_file, requested_index):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
index 41c5c0c5b32..1ab04ccc758 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MeanTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class MeanTest(unittest.TestCase):
def test_throws_if_non_existing_names(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
index c4f3b9b15dd..c990742faa4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
@@ -16,6 +16,8 @@ from testhelpers import run_algorithm
'''
Helper type to represent an entry in a cal file
'''
+
+
class CalFileLine:
_number = None
@@ -49,6 +51,8 @@ class CalFileLine:
'''
A helper resource managing wrapper over a new calfile object. Creates cal file and allows writing to it.
'''
+
+
class DisposableCalFileObject:
_fullpath = None
@@ -75,6 +79,8 @@ class DisposableCalFileObject:
'''
A helper resource managing wrapper over an existing cal file for reading. Disposes of it after reading.
'''
+
+
class ReadableCalFileObject:
_fullpath = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
index 1e64b12c9ea..1693e2aab99 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MuscatSofQWTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class MuscatSofQWTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
index 769d32655ee..53b883d4c05 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/NormaliseSpectraTest.py
@@ -9,6 +9,7 @@ import platform
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
+
class NormaliseSpectraTest(unittest.TestCase):
_positive ='1,2,3,4,5'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
index ace42ad702e..aa9d7bc465b 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/RetrieveRunInfoTest.py
@@ -12,6 +12,7 @@ from mantid import config
from mantid.simpleapi import *
from testhelpers import run_algorithm
+
class RetrieveRunInfoTest(unittest.TestCase):
class_has_been_set_up = False
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
index 06f08d1fa75..2072ca54107 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
@@ -12,6 +12,7 @@ from mantid.api import *
from mantid import config
from testhelpers import run_algorithm
+
class SANSSubtractTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
index 075d3dfa95a..262117d691a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
@@ -12,6 +12,8 @@ from mantid.simpleapi import (CreateWorkspace, LoadInstrument,
MoveInstrumentComponent, CropWorkspace,
SANSWideAngleCorrection, Min, Max, Transpose,
Multiply)
+
+
class SANSWideAngleCorrectionTest(unittest.TestCase):
_sample = None
_trans = None
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
index 51a4daaefb0..f3e5cba6b2c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveNexusPDTest.py
@@ -19,6 +19,7 @@ try:
except ImportError:
runTests = False
+
class SaveNexusPDTest(unittest.TestCase):
def saveFilePath(self, wkspname):
dataDir = mantid.config.getString('defaultsave.directory')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
index 01d01042def..d26707d62d9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SavePlot1DAsJsonTest.py
@@ -15,6 +15,7 @@ from mantid.api import AnalysisDataService
import os, json
+
class SavePlot1DAsJsonTest(unittest.TestCase):
def test_save_one_curve(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
index eda7844c4e1..add3c3bf312 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
@@ -8,6 +8,7 @@
import unittest
from mantid.simpleapi import *
+
class SelectNexusFilesByMetadataTest(unittest.TestCase):
_fileslist = 'INTER00013460,13463,13464.nxs'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
index 3df7b9c6160..004979312f7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/UpdatePeakParameterTableValueTest.py
@@ -11,6 +11,7 @@ from mantid.api import *
from testhelpers import run_algorithm
from mantid.api import AnalysisDataService
+
class UpdatePeakParameterTableValueTest(unittest.TestCase):
def test_updateDouble(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
index ad21dabc24a..e5034dcf812 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
@@ -8,6 +8,7 @@ import unittest
import mantid
from mantid.simpleapi import VelocityAutoCorrelations
+
class VelocityAutoCorrelationsTest(unittest.TestCase):
def test_simple(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
index 4f32929d7a6..6bab314aead 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
@@ -8,6 +8,7 @@ import unittest
import mantid
from mantid.simpleapi import VelocityCrossCorrelations
+
class VelocityCrossCorrelationsTest(unittest.TestCase):
def test_simple(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
index 47accbe218e..36d08de9c64 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioResolutionTest.py
@@ -9,6 +9,7 @@ from mantid.simpleapi import *
from mantid.api import *
import vesuvio.testing as testing
+
class VesuvioResolutionTest(unittest.TestCase):
def setUp(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
index df813d85c93..1c0dac861ed 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
@@ -8,6 +8,7 @@ import unittest
import mantid
from mantid.simpleapi import IndirectResolution
+
class IndirectResolutionTest(unittest.TestCase):
def test_simple(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
index 94c34e678aa..e3496c858e0 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrectionTest.py
@@ -12,6 +12,8 @@ from testhelpers import run_algorithm
import numpy as np
from SANSDarkRunBackgroundCorrection import DarkRunMonitorAndDetectorRemover
from SANSDarkRunBackgroundCorrection import SANSDarkRunBackgroundCorrection
+
+
class SANSDarkRunBackgroundCorrectionTest(unittest.TestCase):
#-----
# Workspace2D tests
@@ -556,6 +558,7 @@ class SANSDarkRunBackgroundCorrectionTest(unittest.TestCase):
return ws
+
class DarkRunMonitorAndDetectorRemoverTest(unittest.TestCase):
def test_finds_all_monitor_indices_when_monitor_is_present(self):
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
index e3af74e5009..9dc6e56a079 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py
@@ -10,6 +10,7 @@ import numpy as np
from SANSStitch import QErrorCorrectionForMergedWorkspaces
+
class SANSStitchTest(unittest.TestCase):
def test_initalize(self):
alg = AlgorithmManager.create('SANSStitch')
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
index a8549d3a5f7..9cae636351e 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStatesTest.py
@@ -318,6 +318,7 @@ def _is_name_in_group(wks_group, name_to_find):
else:
return True
+
def _perform_group_name_search(wks_group, name_to_find):
"""
Performs the search for a name in a group and returns
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
index 6181fa0863d..9815a16b792 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SwapWidthsTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace, WorkspaceGroup
+
class SwapWidthsTest(unittest.TestCase):
_input_ws = 'IN16B_125878_QLd_Result'
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
index 293d1f3b298..51f614d54de 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/TimeSliceTest.py
@@ -8,6 +8,7 @@ import unittest
from mantid.simpleapi import *
from mantid.api import *
+
class TimeSliceTest(unittest.TestCase):
def test_basic(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
index 2dab34043b4..470690b168f 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/AttributeTest.py
@@ -11,6 +11,7 @@ from mantid.simpleapi import Fit
import testhelpers
import numpy
+
class AttributeExample(IFunction1D):
def init(self):
@@ -37,6 +38,7 @@ class AttributeExample(IFunction1D):
FunctionFactory.subscribe(AttributeExample)
+
class AttributeTest(unittest.TestCase):
def test_setAttributeValue_called_on_declaration(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
index 6b78d2e6fa3..4dba5fb1fb6 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/DSFinterp1DFitTest.py
@@ -12,6 +12,7 @@ from mantid.simpleapi import CreateWorkspace, Fit, mtd, SaveNexus
from mantid.api import AnalysisDataService
import sys
+
class DSFinterp1DTestTest(unittest.TestCase):
def generateWorkspaces(self, nf, startf, df, e=False, seed=10):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
index ba38f2004ad..b132abd3da9 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/Example1DFunctionTest.py
@@ -10,6 +10,7 @@ from mantid.api import *
from mantid.simpleapi import Fit
import testhelpers
+
class _InternalMakeLinear(PythonAlgorithm):
def PyInit(self):
@@ -43,6 +44,7 @@ class _InternalMakeLinear(PythonAlgorithm):
self.setProperty("OutputWorkspace", wspace) # Stores the workspace as the given name
+
class Example1DFunctionTest(unittest.TestCase):
def test_function_has_been_registered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
index 91acd5f91f5..07e09153278 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/ExamplePeakFunctionTest.py
@@ -10,6 +10,7 @@ from mantid.api import *
from mantid.simpleapi import Fit
import testhelpers
+
class _InternalMakeGaussian(PythonAlgorithm):
def PyInit(self):
@@ -43,6 +44,7 @@ class _InternalMakeGaussian(PythonAlgorithm):
self.setProperty("OutputWorkspace", wspace) # Stores the workspace as the given name
+
class ExamplePeakFunctionTest(unittest.TestCase):
def test_function_has_been_registered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
index fb0302bfe0f..2b77243966e 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/PrimStretchedExpFTTest.py
@@ -8,6 +8,7 @@ import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
+
class PrimStretchedExpFTTest(unittest.TestCase):
def testRegistered(self):
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
index eb004b996ad..7e4a7a66987 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
@@ -8,6 +8,7 @@ import unittest
from StretchedExpFTTestHelper import isregistered, do_fit
+
class StretchedExpFTTest(unittest.TestCase):
def testRegistered(self):
diff --git a/Framework/PythonInterface/test/testhelpers/__init__.py b/Framework/PythonInterface/test/testhelpers/__init__.py
index 9b27fe897b7..820dce2e78f 100644
--- a/Framework/PythonInterface/test/testhelpers/__init__.py
+++ b/Framework/PythonInterface/test/testhelpers/__init__.py
@@ -18,6 +18,7 @@ import numpy
# Define some pure-Python functions to add to the mix
+
def run_algorithm(name, **kwargs):
"""Run a named algorithm and return the
algorithm handle
diff --git a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
index d425e277b24..cee854f4e7e 100644
--- a/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
+++ b/Framework/PythonInterface/test/testhelpers/algorithm_decorator.py
@@ -7,6 +7,7 @@
import inspect
import re
+
def make_decorator(algorithm_to_decorate):
"""
Dynamically create a builder pattern style decorator around a Mantid algorithm.
diff --git a/MantidPlot/mantidplot.py b/MantidPlot/mantidplot.py
index 835e990dae6..85cda6be56c 100644
--- a/MantidPlot/mantidplot.py
+++ b/MantidPlot/mantidplot.py
@@ -25,6 +25,7 @@ import pymantidplot.qtiplot
# error early if PyQt4 cannot be used
import PyQt4
+
def load_ui(caller_filename, ui_relfilename, baseinstance=None):
'''This is copied from mantidqt.utils.qt and should be deprecated as
soon as possible.'''
diff --git a/MantidPlot/pymantidplot/__init__.py b/MantidPlot/pymantidplot/__init__.py
index f9bc371ea25..c306ad7e164 100644
--- a/MantidPlot/pymantidplot/__init__.py
+++ b/MantidPlot/pymantidplot/__init__.py
@@ -60,6 +60,7 @@ def _get_analysis_data_service():
# -------------------------- Wrapped MantidPlot functions -----------------
+
def runPythonScript(code, asynchronous=False, quiet=False, redirect=True):
"""
Redirects the runPythonScript method to the app object
diff --git a/MantidPlot/pymantidplot/proxies.py b/MantidPlot/pymantidplot/proxies.py
index 8552602c76b..67fa08586b0 100644
--- a/MantidPlot/pymantidplot/proxies.py
+++ b/MantidPlot/pymantidplot/proxies.py
@@ -22,6 +22,7 @@ import mantidqtpython
#--------------------------- MultiThreaded Access ----------------------------
#-----------------------------------------------------------------------------
+
class CrossThreadCall(QtCore.QObject):
"""
Defines a dispatch call that marshals
@@ -90,6 +91,7 @@ class CrossThreadCall(QtCore.QObject):
argtype = int
return argtype
+
def threadsafe_call(callable, *args, **kwargs):
"""
Calls the given function with the given arguments
@@ -100,6 +102,7 @@ def threadsafe_call(callable, *args, **kwargs):
caller = CrossThreadCall(callable)
return caller.dispatch(*args, **kwargs)
+
def new_proxy(classType, callable, *args, **kwargs):
"""
Calls the callable object with the given args and kwargs dealing
@@ -120,6 +123,7 @@ def new_proxy(classType, callable, *args, **kwargs):
#--------------------------- Proxy Objects -----------------------------------
#-----------------------------------------------------------------------------
+
class QtProxyObject(QtCore.QObject):
"""Generic Proxy object for wrapping Qt C++ QObjects.
This holds the QObject internally and passes methods to it.
@@ -208,6 +212,8 @@ class QtProxyObject(QtCore.QObject):
self.__obj = obj
#-----------------------------------------------------------------------------
+
+
class MDIWindow(QtProxyObject):
"""Proxy for the _qti.MDIWindow object.
Also used for subclasses that do not need any methods intercepted (e.g. Table, Note, Matrix)
@@ -219,6 +225,8 @@ class MDIWindow(QtProxyObject):
return new_proxy(Folder, self._getHeldObject().folder)
#-----------------------------------------------------------------------------
+
+
class Graph(MDIWindow):
"""Proxy for the _qti.Graph object.
"""
@@ -436,6 +444,8 @@ class Graph3D(QtProxyObject):
threadsafe_call(self._getHeldObject().setMatrix, matrix._getHeldObject())
#-----------------------------------------------------------------------------
+
+
class Spectrogram(QtProxyObject):
"""Proxy for the _qti.Spectrogram object.
"""
@@ -447,6 +457,8 @@ class Spectrogram(QtProxyObject):
return new_proxy(QtProxyObject, self._getHeldObject().matrix)
#-----------------------------------------------------------------------------
+
+
class Folder(QtProxyObject):
"""Proxy for the _qti.Folder object.
"""
@@ -542,6 +554,8 @@ class Folder(QtProxyObject):
return new_proxy(Folder, self._getHeldObject().rootFolder)
#-----------------------------------------------------------------------------
+
+
class MantidMatrix(MDIWindow):
"""Proxy for the _qti.MantidMatrix object.
"""
@@ -571,6 +585,8 @@ class MantidMatrix(MDIWindow):
return new_proxy(Graph, self._getHeldObject().plotGraph2D, type)
#-----------------------------------------------------------------------------
+
+
class InstrumentView(MDIWindow):
"""Proxy for the instrument window
"""
@@ -751,6 +767,8 @@ class SliceViewerWindowProxy(QtProxyObject):
return liner
#-----------------------------------------------------------------------------
+
+
def getWorkspaceNames(source):
"""Takes a "source", which could be a WorkspaceGroup, or a list
of workspaces, or a list of names, and converts
@@ -798,6 +816,8 @@ def getWorkspaceNames(source):
return ws_names
#-----------------------------------------------------------------------------
+
+
class ProxyCompositePeaksPresenter(QtProxyObject):
def __init__(self, toproxy):
QtProxyObject.__init__(self,toproxy)
@@ -816,6 +836,8 @@ class ProxyCompositePeaksPresenter(QtProxyObject):
return new_proxy(QtProxyObject, self._getHeldObject().getPeaksPresenter, to_present)
#-----------------------------------------------------------------------------
+
+
class SliceViewerProxy(QtProxyObject):
"""Proxy for a C++ SliceViewer widget.
"""
@@ -917,26 +939,32 @@ class TiledWindowProxy(QtProxyObject):
"""
threadsafe_call(self._getHeldObject().clear)
+
def showHelpPage(page_name=None):
"""Show a page in the help system"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showHelpPage, page_name)
+
def showWikiPage(page_name=None):
"""Show a wiki page through the help system"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showWikiPage, page_name)
+
def showAlgorithmHelp(algorithm=None, version=-1):
"""Show an algorithm help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showAlgorithmHelp, algorithm, version)
+
def showConceptHelp(name=None):
"""Show a concept help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showConceptHelp, name)
+
def showFitFunctionHelp(name=None):
"""Show a fit function help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showFitFunctionHelp, name)
+
def showCustomInterfaceHelp(name=None):
"""Show a custom interface help page"""
window = threadsafe_call(mantidqtpython.MantidQt.API.InterfaceManager().showCustomInterfaceHelp, name)
diff --git a/MantidPlot/pymantidplot/qtiplot.py b/MantidPlot/pymantidplot/qtiplot.py
index bb81e658100..70e60bc0a77 100644
--- a/MantidPlot/pymantidplot/qtiplot.py
+++ b/MantidPlot/pymantidplot/qtiplot.py
@@ -24,6 +24,8 @@ from PyQt4 import QtCore
#-----------------------------------------------------------------------------
# Intercept qtiplot "plot" command and forward to plotSpectrum for a workspace
+
+
def plot(source, *args, **kwargs):
"""Create a new plot given a workspace, table or matrix.
diff --git a/MantidPlot/test/MantidPlotInputArgsCheck.py b/MantidPlot/test/MantidPlotInputArgsCheck.py
index 22a3f67994a..dc2d91043f2 100644
--- a/MantidPlot/test/MantidPlotInputArgsCheck.py
+++ b/MantidPlot/test/MantidPlotInputArgsCheck.py
@@ -39,6 +39,7 @@ CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',Units='m
WrongWorkspaceName = 'foo inexistent'
+
class MantidPlotInputArgsCheck(unittest.TestCase):
def setUp(self):
diff --git a/MantidPlot/test/mantidplottests.py b/MantidPlot/test/mantidplottests.py
index cfe3b0ba413..9e9592bbe67 100644
--- a/MantidPlot/test/mantidplottests.py
+++ b/MantidPlot/test/mantidplottests.py
@@ -32,6 +32,7 @@ except:
qtest = False
print("QTest not available")
+
def moveMouseToCentre(widget):
"""Moves the mouse over the widget
"""
@@ -40,6 +41,7 @@ def moveMouseToCentre(widget):
threadsafe_call(QTest.mouseMove, widget)
QtCore.QCoreApplication.processEvents()
+
def runTests(classname):
""" Run the test suite in the class.
Uses the XML runner if the MANTID_SOURCE environment variable was set.
diff --git a/Testing/SystemTests/lib/systemtests/xmlreporter.py b/Testing/SystemTests/lib/systemtests/xmlreporter.py
index 2f1a8a62c9b..2d2d911ed51 100644
--- a/Testing/SystemTests/lib/systemtests/xmlreporter.py
+++ b/Testing/SystemTests/lib/systemtests/xmlreporter.py
@@ -9,6 +9,7 @@ import sys
from xml.dom.minidom import getDOMImplementation
import systemtesting
+
class XmlResultReporter(systemtesting.ResultReporter):
_time_taken = 0.0
diff --git a/Testing/SystemTests/scripts/performance/analysis.py b/Testing/SystemTests/scripts/performance/analysis.py
index de321f10a2f..16e027062d0 100644
--- a/Testing/SystemTests/scripts/performance/analysis.py
+++ b/Testing/SystemTests/scripts/performance/analysis.py
@@ -22,6 +22,8 @@ import random
DATE_STR_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
#============================================================================================
+
+
def get_orderby_clause(last_num):
"""Returns a order by clause that limits to the last # revisions """
if last_num > 0:
@@ -96,6 +98,8 @@ def get_unique_fields(results, field):
return list(out)
#============================================================================================
+
+
def get_results_matching(results, field, value):
"""Given a list of TestResult,
return a list of TestResult's where 'field' matches 'value'."""
@@ -273,6 +277,8 @@ default_html_header = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transition
default_html_footer = """</body></html>"""
#============================================================================================
+
+
def make_css_file(path):
""" Make a save the report.css file to be used by all html """
default_css = """
@@ -308,6 +314,8 @@ font-weight: bold;
f.close()
#============================================================================================
+
+
def make_environment_html(res):
"""Return a HTML string with details of test environment, taken from the
'res' TestResult object"""
@@ -320,6 +328,8 @@ def make_environment_html(res):
return html
#============================================================================================
+
+
def make_detailed_html_file(basedir, name, fig1, fig2, fig3, fig4, last_num):
""" Create a detailed HTML report for the named test """
html = default_html_header
diff --git a/Testing/SystemTests/scripts/performance/sqlresults.py b/Testing/SystemTests/scripts/performance/sqlresults.py
index c5142d6e2a2..ec1f57c4836 100644
--- a/Testing/SystemTests/scripts/performance/sqlresults.py
+++ b/Testing/SystemTests/scripts/performance/sqlresults.py
@@ -20,6 +20,8 @@ import math
import random
#====================================================================================
+
+
def getSourceDir():
"""Returns the location of the source code."""
import os
@@ -42,17 +44,23 @@ TABLE_FIELDS = ['date', 'name', 'type', 'host', 'environment', 'runner',
database_file = os.path.join(getSourceDir(), "MantidSystemTests.db")
#=====================================================================
+
+
def get_database_filename():
"""Return the path to the database to use """
return database_file
#=====================================================================
+
+
def set_database_filename(value):
"""Override the default database location"""
global database_file
database_file = value
#=====================================================================
+
+
def SQLgetConnection():
""" Get a connection to the SQL database """
# These are automatic conversion factors
@@ -101,6 +109,8 @@ def get_latest_result(name=''):
return None
#=====================================================================
+
+
def get_results(name, type="", where_clause='', orderby_clause=''):
"""Return a list of testresult.TestResult objects
generated from looking up in the table
@@ -177,6 +187,8 @@ def get_all_field_values(field_name, where_clause=""):
return out
#=====================================================================
+
+
def get_latest_revison():
""" Return the latest revision number """
# Now get the latest revision
@@ -191,6 +203,8 @@ def get_latest_revison():
return 0
#=====================================================================
+
+
def add_revision():
""" Adds an entry with the current date/time to the table.
Retrieve the index of that entry = the "revision".
diff --git a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index 00023b9f62a..42a33495902 100644
--- a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -8,6 +8,8 @@
import systemtesting
import os
from mantid.simpleapi import *
+
+
def _skip_test():
"""Helper function to determine if we run the test"""
import platform
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index 2138169c8ed..8d445c416df 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -14,6 +14,8 @@ import shutil
from abc import ABCMeta, abstractmethod
from Direct.PropertyManager import PropertyManager
#----------------------------------------------------------------------
+
+
class ISISDirectInelasticReduction(metaclass=ABCMeta):
"""A base class for the ISIS direct inelastic tests
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index 94070c61e17..9005d12dd5d 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -81,6 +81,7 @@ from mantid.simpleapi import *
from mantid.api import FileFinder
from systemtesting import MantidSystemTest, using_gsl_v1
+
class ISISIndirectInelasticBase(metaclass=ABCMeta):
'''
A common base class for the ISISIndirectInelastic* base classes.
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index 0df9ac4267e..93718543151 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -13,6 +13,8 @@ import systemtesting
from mantid.simpleapi import *
import os
from abc import ABCMeta, abstractmethod
+
+
class ISISReflInstrumentIDFTest(metaclass=ABCMeta):
@abstractmethod
diff --git a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index 1a9f53d0b6e..b071c1c91a3 100644
--- a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -10,6 +10,8 @@ from abc import ABCMeta, abstractmethod
import systemtesting
import mantid.simpleapi as ms
from mantid import mtd
+
+
class ISISIndirectDiffractionReduction(metaclass=ABCMeta):
"""
Base class for tests that use the ISISIndirectDiffractionReduction algorithm.
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 9be0eae5aa7..8925de62e64 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -14,6 +14,8 @@ from mantid.simpleapi import *
import mantid.api
from abc import ABCMeta, abstractmethod
+
+
class LoadAndCheckBase(metaclass=ABCMeta):
__comparison_out_workspace_name = 'a_integrated'
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 762a2d69e24..2ef9bc88442 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -13,6 +13,8 @@ import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
+
+
class ReflectometryISIS(metaclass=ABCMeta):
@abstractmethod
diff --git a/Testing/SystemTests/tests/analysis/SortHKLTest.py b/Testing/SystemTests/tests/analysis/SortHKLTest.py
index 8a3d95119b9..17774047eed 100644
--- a/Testing/SystemTests/tests/analysis/SortHKLTest.py
+++ b/Testing/SystemTests/tests/analysis/SortHKLTest.py
@@ -9,6 +9,8 @@ import systemtesting
import json
from mantid.simpleapi import *
from mantid.geometry import PointGroupFactory
+
+
class HKLStatisticsTestMixin(object):
def _init_test_data(self):
self._ws = CreateSimulationWorkspace(Instrument='TOPAZ',
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
index b7f4cbb15d4..f8c4e2ff04b 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
@@ -8,6 +8,8 @@
import systemtesting
from mantid.simpleapi import *
from mantid.geometry import *
+
+
class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
'''
This test uses PoldiCreatePeaksFromCell to generate lists of reflections for fake crystal structures, one for each
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
index f3e8d3df3c6..df758965158 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
@@ -7,6 +7,8 @@
# pylint: disable=no-init,invalid-name
import systemtesting
from mantid.geometry import *
+
+
class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
'''
This test checks that SpaceGroup.isAllowedUnitCell produces the expected result for each registered space group.
diff --git a/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 6eeb6a8b27d..4e4b5f08703 100644
--- a/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -13,6 +13,8 @@ It also detects if a new category is created (i.e. someone uses Utilities instea
import systemtesting
import mantid
import re
+
+
class SphinxWarnings(systemtesting.MantidSystemTest):
def __init__(self):
systemtesting.MantidSystemTest.__init__(self)
diff --git a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
index 731b3e3d3b4..cafee1e0a86 100755
--- a/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
+++ b/Testing/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
@@ -18,6 +18,7 @@ args = []
available_types = set(['scons'])
tool_stdout = PIPE
+
def main():
global options
global args
@@ -75,11 +76,13 @@ def main():
for t in tests:
clean_test(t)
+
def crawl_tests(target):
"""Gather the directories in the test directory."""
files = os.listdir(target)
return [f for f in files if isdir(f) and f[0] != '.']
+
def purge_tests(dirs):
"""Look at the test candidates and purge those that aren't from the list"""
tests = []
@@ -90,21 +93,25 @@ def purge_tests(dirs):
warn("{0} is not a test (missing TestDef.py file).".format(t))
return tests
+
def warn(msg):
"""A general warning function."""
if options.verbose:
print('[Warn]: ' + msg, file=sys.stderr)
+
def notice(msg):
"""A general print function."""
if options.verbose:
print(msg)
+
def debug(msg):
"""A debugging function"""
if options.debug:
print(msg)
+
def run_test(t):
"""Runs the test in directory t."""
opts = read_opts(t)
@@ -137,6 +144,7 @@ def run_test(t):
else:
print("test '{0}' successful.".format(t))
+
def read_opts(t):
"""Read the test options and return them."""
opts = {
@@ -147,6 +155,7 @@ def read_opts(t):
exec(open(join(t, "TestDef.py")), opts)
return opts
+
def setup_env(t, opts):
"""Set up the environment for the test."""
# symlinks
@@ -159,6 +168,7 @@ def setup_env(t, opts):
os.unlink(to)
os.symlink(frm, to)
+
def teardown_env(t, opts):
"""Remove all files generated for the test."""
links = opts['links']
@@ -167,6 +177,7 @@ def teardown_env(t, opts):
debug('removing link {0}'.format(to))
os.unlink(to)
+
def clean_test(t):
"""Remove all generated files."""
opts = read_opts(t)
@@ -176,6 +187,7 @@ def clean_test(t):
clean_scons(t, opts)
teardown_env(t, opts)
+
def clean_scons(t, opts):
"""Make scons clean after itself."""
cwd = os.getcwd()
@@ -189,6 +201,7 @@ def clean_scons(t, opts):
if isfile(sconsign):
os.unlink(sconsign)
+
def run_scons(t, opts):
"""Run scons test."""
cwd = os.getcwd()
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
index abf167bb3cf..09000ae82eb 100644
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
@@ -11,6 +11,7 @@ inBlock = 0
options=None
lastLineVoid = False
+
def scanInputFiles(files, _options):
'''Scan all input files for test suites'''
global options
@@ -30,6 +31,8 @@ def scanInputFiles(files, _options):
return [options,suites]
lineCont_re = re.compile('(.*)\\\s*$')
+
+
def scanInputFile(fileName):
'''Scan single input file for test suites'''
file = open(fileName)
@@ -56,6 +59,7 @@ def scanInputFile(fileName):
closeSuite()
file.close()
+
def scanInputLine( fileName, lineNo, line ):
'''Scan single input line for interesting stuff'''
scanLineForExceptionHandling( line )
@@ -67,6 +71,7 @@ def scanInputLine( fileName, lineNo, line ):
if suite:
scanLineInsideSuite( suite, lineNo, line )
+
def scanLineInsideSuite( suite, lineNo, line ):
'''Analyze line which is part of a suite'''
global inBlock
@@ -75,6 +80,7 @@ def scanLineInsideSuite( suite, lineNo, line ):
scanLineForCreate( suite, lineNo, line )
scanLineForDestroy( suite, lineNo, line )
+
def lineBelongsToSuite( suite, lineNo, line ):
'''Returns whether current line is part of the current suite.
This can be false when we are in a generated suite outside of CXXTEST_CODE() blocks
@@ -91,6 +97,8 @@ def lineBelongsToSuite( suite, lineNo, line ):
std_re = re.compile( r"\b(std\s*::|CXXTEST_STD|using\s+namespace\s+std\b|^\s*\#\s*include\s+<[a-z0-9]+>)" )
+
+
def scanLineForStandardLibrary( line ):
'''Check if current line uses standard library'''
global options
@@ -99,6 +107,8 @@ def scanLineForStandardLibrary( line ):
options.haveStandardLibrary = 1
exception_re = re.compile( r"\b(throw|try|catch|TSM?_ASSERT_THROWS[A-Z_]*)\b" )
+
+
def scanLineForExceptionHandling( line ):
'''Check if current line uses exception handling'''
global options
@@ -112,6 +122,8 @@ testsuite = '(?:(?:::)?\s*CxxTest\s*::\s*)?TestSuite'
suite_re = re.compile( r"\bclass\s+(%s)\s*:(?:\s*%s\s*,)*\s*public\s+%s"
% (classdef, baseclassdef, testsuite) )
generatedSuite_re = re.compile( r'\bCXXTEST_SUITE\s*\(\s*(\w*)\s*\)' )
+
+
def scanLineForSuiteStart( fileName, lineNo, line ):
'''Check if current line starts a new test suite'''
m = suite_re.search( line )
@@ -122,6 +134,7 @@ def scanLineForSuiteStart( fileName, lineNo, line ):
sys.stdout.write( "%s:%s: Warning: Inline test suites are deprecated.\n" % (fileName, lineNo) )
startSuite( m.group(1), fileName, lineNo, 1 )
+
def startSuite( name, file, line, generated ):
'''Start scanning a new suite'''
global suite
@@ -138,6 +151,7 @@ def startSuite( name, file, line, generated ):
'tests' : [],
'lines' : [] }
+
def lineStartsBlock( line ):
'''Check if current line starts a new CXXTEST_CODE() block'''
return re.search( r'\bCXXTEST_CODE\s*\(', line ) is not None
@@ -145,6 +159,8 @@ def lineStartsBlock( line ):
test_re = re.compile( r'^([^/]|/[^/])*\bvoid\s+([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
void_re = re.compile( r'^([^/]|/[^/])*\bvoid\s*$' )
test_novoid_re = re.compile( r'^([^/]|/[^/])*\b([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
+
+
def scanLineForTest( suite, lineNo, line ):
'''Check if current line starts a test'''
global lastLineVoid
@@ -162,6 +178,7 @@ def scanLineForTest( suite, lineNo, line ):
if m3:
lastLineVoid = True
+
def addTest( suite, name, line ):
'''Add a test function to the current suite'''
test = { 'name' : name,
@@ -172,6 +189,7 @@ def addTest( suite, name, line ):
}
suite['tests'].append( test )
+
def addLineToBlock( suite, lineNo, line ):
'''Append the line to the current CXXTEST_CODE() block'''
line = fixBlockLine( suite, lineNo, line )
@@ -183,6 +201,7 @@ def addLineToBlock( suite, lineNo, line ):
suite['lines'].append( line )
return e is None
+
def fixBlockLine( suite, lineNo, line):
'''Change all [E]TS_ macros used in a line to _[E]TS_ macros with the correct file/line'''
return re.sub( r'\b(E?TSM?_(ASSERT[A-Z_]*|FAIL))\s*\(',
@@ -190,17 +209,22 @@ def fixBlockLine( suite, lineNo, line):
line, 0 )
create_re = re.compile( r'\bstatic\s+\w+\s*\*\s*createSuite\s*\(\s*(void)?\s*\)' )
+
+
def scanLineForCreate( suite, lineNo, line ):
'''Check if current line defines a createSuite() function'''
if create_re.search( line ):
addSuiteCreateDestroy( suite, 'create', lineNo )
destroy_re = re.compile( r'\bstatic\s+void\s+destroySuite\s*\(\s*\w+\s*\*\s*\w*\s*\)' )
+
+
def scanLineForDestroy( suite, lineNo, line ):
'''Check if current line defines a destroySuite() function'''
if destroy_re.search( line ):
addSuiteCreateDestroy( suite, 'destroy', lineNo )
+
def cstr( s ):
'''Convert a string to its C representation'''
return '"' + s.replace( '\\', '\\\\' ) + '"'
@@ -212,6 +236,7 @@ def addSuiteCreateDestroy( suite, which, line ):
abort( '%s:%s: %sSuite() already declared' % ( suite['file'], str(line), which ) )
suite[which] = line
+
def closeSuite():
'''Close current suite and add it to the list if valid'''
global suite
@@ -221,6 +246,7 @@ def closeSuite():
rememberSuite(suite)
suite = None
+
def verifySuite(suite):
'''Verify current suite is legal'''
if 'create' in suite and 'destroy' not in suite:
@@ -230,6 +256,7 @@ def verifySuite(suite):
abort( '%s:%s: Suite %s has destroySuite() but no createSuite()' %
(suite['file'], suite['destroy'], suite['name']) )
+
def rememberSuite(suite):
'''Add current suite to list'''
global suites
diff --git a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
index ed751d79ec3..391b8b3c6dd 100755
--- a/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
+++ b/Testing/Tools/cxxtest/python/cxxtest/cxxtestgen.py
@@ -24,6 +24,7 @@ wrotePreamble = 0
wroteWorld = 0
lastIncluded = ''
+
def main(args=None):
'''The main program'''
#
@@ -45,6 +46,7 @@ def main(args=None):
[options,suites] = cxxtest_parser.scanInputFiles( files, options )
writeOutput()
+
def parseCommandline(args):
'''Analyze command line arguments'''
global imported_fog
@@ -160,11 +162,13 @@ def printVersion():
sys.stdout.write( "This is CxxTest version INSERT_VERSION_HERE.\n" )
sys.exit(0)
+
def setFiles(patterns ):
'''Set input files specified on command line'''
files = expandWildcards( patterns )
return files
+
def expandWildcards( patterns ):
'''Expand all wildcards in an array (glob)'''
fileNames = []
@@ -174,6 +178,7 @@ def expandWildcards( patterns ):
fileNames.append( fixBackslashes( fileName ) )
return fileNames
+
def fixBackslashes( fileName ):
'''Convert backslashes to slashes in file name'''
return re.sub( r'\\', '/', fileName, 0 )
@@ -186,6 +191,7 @@ def writeOutput():
else:
writeSimpleOutput()
+
def writeSimpleOutput():
'''Create output not based on template'''
output = startOutputFile()
@@ -202,6 +208,8 @@ def writeSimpleOutput():
include_re = re.compile( r"\s*\#\s*include\s+<cxxtest/" )
preamble_re = re.compile( r"^\s*<CxxTest\s+preamble>\s*$" )
world_re = re.compile( r"^\s*<CxxTest\s+world>\s*$" )
+
+
def writeTemplateOutput():
'''Create output based on template file'''
template = open(options.templateFileName)
@@ -222,6 +230,7 @@ def writeTemplateOutput():
template.close()
output.close()
+
def startOutputFile():
'''Create output file and write header'''
if options.outputFileName is not None:
@@ -231,6 +240,7 @@ def startOutputFile():
output.write( "/* Generated file, do not edit */\n\n" )
return output
+
def writePreamble( output ):
'''Write the CxxTest header (#includes and #defines)'''
global wrotePreamble
@@ -265,6 +275,7 @@ def writePreamble( output ):
output.write( "\n" )
wrotePreamble = 1
+
def writeMain( output ):
'''Write the main() function for the test runner'''
if not (options.gui or options.runner):
@@ -311,6 +322,7 @@ def writeWorld( output ):
writeInitialize( output )
wroteWorld = 1
+
def writeSuites(output):
'''Write all TestDescriptions and SuiteDescriptions'''
for suite in suites:
@@ -325,14 +337,17 @@ def writeSuites(output):
writeSuiteDescription( output, suite )
writeTestDescriptions( output, suite )
+
def isGenerated(suite):
'''Checks whether a suite class should be created'''
return suite['generated']
+
def isDynamic(suite):
'''Checks whether a suite is dynamic'''
return 'create' in suite
+
def writeInclude(output, file):
'''Add #include "file" statement'''
global lastIncluded
@@ -340,6 +355,7 @@ def writeInclude(output, file):
output.writelines( [ '#include "', file, '"\n\n' ] )
lastIncluded = file
+
def generateSuite( output, suite ):
'''Write a suite declared with CXXTEST_SUITE()'''
output.write( 'class %s : public CxxTest::TestSuite {\n' % suite['name'] )
@@ -348,6 +364,7 @@ def generateSuite( output, suite ):
output.write(line)
output.write( '};\n\n' )
+
def writeSuitePointer( output, suite ):
'''Create static suite pointer object for dynamic suites'''
if options.noStaticInit:
@@ -355,10 +372,12 @@ def writeSuitePointer( output, suite ):
else:
output.write( 'static %s *%s = nullptr;\n\n' % (suite['name'], suite['object']) )
+
def writeSuiteObject( output, suite ):
'''Create static suite object for non-dynamic suites'''
output.writelines( [ "static ", suite['name'], " ", suite['object'], ";\n\n" ] )
+
def writeTestList( output, suite ):
'''Write the head of the test linked list for a suite'''
if options.noStaticInit:
@@ -366,6 +385,7 @@ def writeTestList( output, suite ):
else:
output.write( 'static CxxTest::List %s = { nullptr, nullptr };\n' % suite['tlist'] )
+
def writeWorldDescr( output ):
'''Write the static name of the world name'''
if options.noStaticInit:
@@ -373,11 +393,13 @@ def writeWorldDescr( output ):
else:
output.write( 'const char* CxxTest::RealWorldDescription::_worldName = "cxxtest";\n' )
+
def writeTestDescriptions( output, suite ):
'''Write all test descriptions for a suite'''
for test in suite['tests']:
writeTestDescription( output, suite, test )
+
def writeTestDescription( output, suite, test ):
'''Write test description object'''
output.write( 'static class %s final : public CxxTest::RealTestDescription {\n' % test['class'] )
@@ -388,19 +410,23 @@ def writeTestDescription( output, suite, test ):
output.write( ' void runTest() override final { %s } // NOLINT\n' % runBody( suite, test ) )
output.write( '} %s;\n\n' % test['object'] )
+
def runBody( suite, test ):
'''Body of TestDescription::run()'''
if isDynamic(suite): return dynamicRun( suite, test )
else: return staticRun( suite, test )
+
def dynamicRun( suite, test ):
'''Body of TestDescription::run() for test in a dynamic suite'''
return 'if ( ' + suite['object'] + ' ) ' + suite['object'] + '->' + test['name'] + '();'
+
def staticRun( suite, test ):
'''Body of TestDescription::run() for test in a non-dynamic suite'''
return suite['object'] + '.' + test['name'] + '();'
+
def writeSuiteDescription( output, suite ):
'''Write SuiteDescription object'''
if isDynamic( suite ):
@@ -408,6 +434,7 @@ def writeSuiteDescription( output, suite ):
else:
writeStaticDescription( output, suite )
+
def writeDynamicDescription( output, suite ):
'''Write SuiteDescription for a dynamic suite'''
output.write( 'CxxTest::DynamicSuiteDescription<%s> %s' % (suite['name'], suite['dobject']) )
@@ -417,6 +444,7 @@ def writeDynamicDescription( output, suite ):
suite['object'], suite['create'], suite['destroy']) )
output.write( ';\n\n' )
+
def writeStaticDescription( output, suite ):
'''Write SuiteDescription for a static suite'''
output.write( 'CxxTest::StaticSuiteDescription %s' % suite['dobject'] )
@@ -425,10 +453,12 @@ def writeStaticDescription( output, suite ):
(suite['cfile'], suite['line'], suite['name'], suite['object'], suite['tlist']) )
output.write( ';\n\n' )
+
def writeRoot(output):
'''Write static members of CxxTest classes'''
output.write( '#include <cxxtest/Root.cpp>\n' )
+
def writeInitialize(output):
'''Write CxxTest::initialize(), which replaces static initialization'''
output.write( 'namespace CxxTest {\n' )
diff --git a/buildconfig/CMake/FindPyQt.py b/buildconfig/CMake/FindPyQt.py
index f938011abd1..e17e534e8e7 100644
--- a/buildconfig/CMake/FindPyQt.py
+++ b/buildconfig/CMake/FindPyQt.py
@@ -12,6 +12,7 @@ import sys
QT_TAG_RE = re.compile(r'Qt_\d+_\d+_\d+')
+
class PyQtConfig(object):
version_hex = None
@@ -96,6 +97,7 @@ def main():
print(PyQtConfig('PyQt%d' % args.version))
return 0
+
def get_options():
parser = argparse.ArgumentParser(description='Extract PyQt config information')
parser.add_argument('version', type=int, help="PyQt major version")
diff --git a/buildconfig/class_maker.py b/buildconfig/class_maker.py
index 13f1a099a7b..cead3367714 100755
--- a/buildconfig/class_maker.py
+++ b/buildconfig/class_maker.py
@@ -17,11 +17,15 @@ from cmakelists_utils import *
VERSION = "1.0"
#======================================================================
+
+
def get_year():
"""returns the current year"""
return datetime.datetime.now().year
#======================================================================
+
+
def write_header(subproject, classname, filename, args):
"""Write a class header file"""
print("Writing header file to", filename)
diff --git a/buildconfig/cmakelists_utils.py b/buildconfig/cmakelists_utils.py
index 0088b6d52e4..9731251afe9 100644
--- a/buildconfig/cmakelists_utils.py
+++ b/buildconfig/cmakelists_utils.py
@@ -4,6 +4,8 @@ import re
import sys
#======================================================================================
+
+
def find_basedir(project, subproject):
""" Returns the base directory. If the subproject is known to be in MantidQt or Vates, it uses that.
The default is current dir + Framework
@@ -120,6 +122,8 @@ def fix_cmake_format(subproject):
f.close()
#======================================================================
+
+
def fix_all_cmakes():
""" Fix all cmake files """
projects = ["Algorithms", "DataObjects", "MDAlgorithms", "API",
diff --git a/buildconfig/delete_class.py b/buildconfig/delete_class.py
index 8f066b6a330..322deeb3c08 100755
--- a/buildconfig/delete_class.py
+++ b/buildconfig/delete_class.py
@@ -21,6 +21,8 @@ def delete_one(oldfilename):
os.system(cmd)
#======================================================================
+
+
def delete_all(subproject, classname, args):
# Directory at base of subproject
diff --git a/buildconfig/move_class.py b/buildconfig/move_class.py
index 9e415cacdce..23686f350a1 100755
--- a/buildconfig/move_class.py
+++ b/buildconfig/move_class.py
@@ -15,6 +15,8 @@ import sys
from cmakelists_utils import *
#======================================================================
+
+
def move_one(subproject, classname, newproject, newclassname, oldfilename, newfilename, args):
"""Move one file """
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
index fe2c343ad16..10c01a68641 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/model_colour.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
def line_colours():
colour_table = ["red", "blue", "black"]
return colour_table
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
index 1c921b3d04b..a69fe0ac83a 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/plot_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class PlotPresenter(object):
def __init__(self, view):
diff --git a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
index a42e14c3196..e970b3d6ee4 100644
--- a/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
+++ b/dev-docs/source/MVPTutorial/CompleteGUIcode/presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class Presenter(object):
def __init__(self, view, colours):
diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index ca37db2a85c..51f655f1f95 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -17,6 +17,8 @@ DEPRECATE_USE_ALG_RE = re.compile(r"Use\s(([A-Z][a-zA-Z0-9]+)\s(version ([0-9])+
SCREENSHOT_MAX_HEIGHT = 250
#--------------------------------------------------------------------------
+
+
class AlgorithmDirective(AlgorithmBaseDirective):
"""
@@ -226,6 +228,7 @@ def html_collect_pages(dummy_app):
#------------------------------------------------------------------------------------------------------------
+
def setup(app):
"""
Setup the directives when the extension is activated
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 188dda3454c..06f25388847 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/docs/sphinxext/mantiddoc/directives/categories.py
@@ -27,6 +27,7 @@ CATEGORIES_DIR = "categories"
# directory of the document and the category directory
INDEX_CATEGORIES = ["Algorithms", "FitFunctions", "Concepts", "Techniques", "Interfaces"]
+
class LinkItem(object):
"""
Defines a linkable item with a name and html reference
@@ -81,6 +82,7 @@ class LinkItem(object):
# endclass
+
class PageRef(LinkItem):
"""
Store details of a single page reference
@@ -91,6 +93,7 @@ class PageRef(LinkItem):
#endclass
+
class Category(LinkItem):
"""
Store information about a single category
@@ -313,6 +316,7 @@ def to_unix_style_path(path):
#---------------------------------------------------------------------------------
+
def html_collect_pages(app):
"""
Callback for the 'html-collect-pages' Sphinx event. Adds category
@@ -331,6 +335,7 @@ def html_collect_pages(app):
yield (name, context, template)
# enddef
+
def create_category_pages(app):
"""
Returns an iterable of (category_name, context, "category.html")
@@ -391,6 +396,8 @@ def create_category_pages(app):
# enddef
#-----------------------------------------------------------------------------------------------------------
+
+
def create_top_algorithm_category(categories):
"""
Returns a tuple of (category_name, context, "category.html")
@@ -443,6 +450,7 @@ def create_top_algorithm_category(categories):
top_html_path_noext = posixpath.join('algorithms', 'index')
return (top_html_path_noext, top_context, template)
+
def extract_matching_categories(input_categories,filepath):
"""
Extract entries with a name matching that included the supplied file.
@@ -464,6 +472,8 @@ def extract_matching_categories(input_categories,filepath):
input_categories[:] = [category for category in input_categories if category.name not in name_list]
return extracted_list
+
+
def purge_categories(app, env, docname):
"""
Purge information about the given document name from the tracked algorithms
@@ -489,6 +499,8 @@ def purge_categories(app, env, docname):
pages.remove(deadref)
#------------------------------------------------------------------------------
+
+
def setup(app):
# Add categories directive
app.add_directive('categories', CategoriesDirective)
diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py
index fa7edb7f6ff..a01a6af317c 100644
--- a/docs/sphinxext/mantiddoc/directives/diagram.py
+++ b/docs/sphinxext/mantiddoc/directives/diagram.py
@@ -106,6 +106,7 @@ class DiagramDirective(BaseDirective):
#------------------------------------------------------------------------------------------------------------
+
def setup(app):
"""
Setup the directives when the extension is activated
diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py
index 29c782cc234..d8f97dd546f 100644
--- a/docs/sphinxext/mantiddoc/directives/properties.py
+++ b/docs/sphinxext/mantiddoc/directives/properties.py
@@ -10,6 +10,7 @@ import re
from string import punctuation
SUBSTITUTE_REF_RE = re.compile(r'\|(.+?)\|')
+
class PropertiesDirective(AlgorithmBaseDirective):
"""
diff --git a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
index 7acf3fc7b3a..ffdd23eede1 100644
--- a/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
+++ b/qt/python/mantidqt/utils/qt/test/test_qappthreadcall.py
@@ -15,9 +15,11 @@ from mantidqt.utils.asynchronous import AsyncTask, TaskExitCode
from mantidqt.utils.qt.qappthreadcall import QAppThreadCall
from mantidqt.utils.qt.testing import start_qapplication
+
class CustomException(Exception):
pass
+
@start_qapplication
class QAppThreadCallTest(unittest.TestCase):
def test_correct_exception_is_raised_when_called_on_main_thread(self):
diff --git a/qt/python/mantidqt/widgets/observers/observing_presenter.py b/qt/python/mantidqt/widgets/observers/observing_presenter.py
index 3453bd63784..de6929d8280 100644
--- a/qt/python/mantidqt/widgets/observers/observing_presenter.py
+++ b/qt/python/mantidqt/widgets/observers/observing_presenter.py
@@ -6,6 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
+
class ObservingPresenter(object):
"""
This class provides some common functions for classes that need to be observable.
diff --git a/qt/python/mantidqt/widgets/observers/observing_view.py b/qt/python/mantidqt/widgets/observers/observing_view.py
index ba42da7920b..52b52d6bbf7 100644
--- a/qt/python/mantidqt/widgets/observers/observing_view.py
+++ b/qt/python/mantidqt/widgets/observers/observing_view.py
@@ -6,6 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
+
class ObservingView(object):
"""
This class provides some common functions needed across views observers the ADS.
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
index ab0085f03ae..96bd7a51cb8 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/__init__.py
@@ -6,6 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
+
class AxProperties(dict):
"""
An object to store the properties that can be set in the Axes
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
index 1ded4e789b3..a06426ed88f 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/error_column.py
@@ -5,6 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
+
+
class ErrorColumn:
CANNOT_SET_Y_TO_BE_OWN_YERR_MESSAGE = "Cannot set Y column to be its own YErr"
UNHANDLED_COMPARISON_LOGIC_MESSAGE = "Unhandled comparison logic with type {}"
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
index 0f3f73aa6bd..0d3447ebb8d 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/marked_columns.py
@@ -5,6 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantidqt package.
+
+
class MarkedColumns:
X_LABEL = "[X{}]"
Y_LABEL = "[Y{}]"
diff --git a/scripts/AbinsModules/GeneralData.py b/scripts/AbinsModules/GeneralData.py
index 43e8528cc9b..2c2c56d97e4 100644
--- a/scripts/AbinsModules/GeneralData.py
+++ b/scripts/AbinsModules/GeneralData.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class GeneralData(object):
def __init__(self):
diff --git a/scripts/AbinsModules/Instruments/Instrument.py b/scripts/AbinsModules/Instruments/Instrument.py
index 8df59ef63e8..1bfdb5d19e3 100644
--- a/scripts/AbinsModules/Instruments/Instrument.py
+++ b/scripts/AbinsModules/Instruments/Instrument.py
@@ -5,6 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# noinspection PyPep8Naming
+
+
class Instrument(object):
_name = None
diff --git a/scripts/Calibration/tube_calib_fit_params.py b/scripts/Calibration/tube_calib_fit_params.py
index 49b229c0d40..76ae22eec9d 100644
--- a/scripts/Calibration/tube_calib_fit_params.py
+++ b/scripts/Calibration/tube_calib_fit_params.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class TubeCalibFitParams(object):
# This class is to take the fitting method and parameters for fitting the peaks created by the calibration slits etc
diff --git a/scripts/Calibration/tube_spec.py b/scripts/Calibration/tube_spec.py
index 0cc499bce8f..a7df4ebd859 100644
--- a/scripts/Calibration/tube_spec.py
+++ b/scripts/Calibration/tube_spec.py
@@ -12,6 +12,7 @@
# Author: Karl Palmen ISIS
+
class TubeSpec:
"""
The python class :class:`~tube_spec.TubeSpec` provides a way of specifying a set of tubes for
diff --git a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
index b6ed3cc38f2..c5f1bcae8e4 100644
--- a/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
+++ b/scripts/Diffraction/isis_powder/gem_routines/gem_enums.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class GEM_CHOPPER_MODES(object):
enum_friendly_name = "Gem chopper modes"
PDF = "PDF"
diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
index 951fc4615c7..d785d775e6a 100644
--- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
+++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class HRPD_TOF_WINDOWS(object):
enum_friendly_name = "TOF windows"
window_10_50 = "10-50"
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
index 4c91b13879a..3649c244f46 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_enums.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class PEARL_FOCUS_MODES(object):
enum_friendly_name = "focus modes"
all = "all"
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
index 7f52d43b70b..ae042fb669e 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_enums.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class POLARIS_CHOPPER_MODES(object):
enum_friendly_name = "Polaris chopper modes"
PDF = "PDF"
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
index 2c225d34dd7..0f083d17fc0 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_sanity.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
def calibration_file_sanity_check(yaml_dict, file_path):
# Check that the dictionary has data
if not yaml_dict:
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
index 3c05d04b362..d0902aa517b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class CalibrationInfo(object):
"""
Keeps track of the parameters that went into a calibration created by the engineering diffraction GUI.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
index 2dc31455dd8..ba44698dd08 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class CroppingPresenter(object):
def __init__(self, model, view):
self.model = model
diff --git a/scripts/Inelastic/CrystalField/normalisation.py b/scripts/Inelastic/CrystalField/normalisation.py
index 98b56a9b2ab..bde70d5bb95 100644
--- a/scripts/Inelastic/CrystalField/normalisation.py
+++ b/scripts/Inelastic/CrystalField/normalisation.py
@@ -7,6 +7,8 @@
import numpy as np
from CrystalField.energies import energies as CFEnergy
from CrystalField.fitting import ionname2Nre
+
+
def _get_normalisation(nre, bnames):
""" Helper function to calculate the normalisation factor.
Defined as: ||Blm|| = sum_{Jz,Jz'} |<Jz|Blm|Jz'>|^2 / (2J+1)
diff --git a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
index 7552cc5daa3..e7cffe80a92 100644
--- a/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
+++ b/scripts/MultiPlotting/QuickEdit/quickEdit_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class QuickEditPresenter(object):
def __init__(self, view):
diff --git a/scripts/MultiPlotting/label.py b/scripts/MultiPlotting/label.py
index c89ce83666c..ffa28338455 100644
--- a/scripts/MultiPlotting/label.py
+++ b/scripts/MultiPlotting/label.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class Label(object):
def __init__(
diff --git a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
index 4c828cf2062..40e3d95f504 100644
--- a/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
+++ b/scripts/Muon/GUI/Common/context_example/context_example_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class ContextExamplePresenter(object):
def __init__(self, view, model):
diff --git a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
index c52c94b829e..c3b8ee64d47 100644
--- a/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy/dummy_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class DummyPresenter(object):
def __init__(self,view,model):
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
index 4e88d464fc0..9d178203f5d 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_model.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class DummyLabelModel(object):
def __init__(self, context, key):
diff --git a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
index d98d96b7745..dd753d9e253 100644
--- a/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
+++ b/scripts/Muon/GUI/Common/dummy_label/dummy_label_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class DummyLabelPresenter(object):
"""
diff --git a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
index dd671bcb1cc..8a0077f9b98 100644
--- a/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
+++ b/scripts/Muon/GUI/Common/home_tab/home_tab_model.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class HomeTabModel(object):
def __init__(self, context=None):
diff --git a/scripts/Muon/GUI/Common/thread_model_wrapper.py b/scripts/Muon/GUI/Common/thread_model_wrapper.py
index 3f3a91c2835..32f05968945 100644
--- a/scripts/Muon/GUI/Common/thread_model_wrapper.py
+++ b/scripts/Muon/GUI/Common/thread_model_wrapper.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class ThreadModelWrapper(object):
def __init__(self, function=None):
self.callback = function
diff --git a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
index bc7223dcefa..20eaf29fd7a 100644
--- a/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
+++ b/scripts/Muon/GUI/Common/utilities/muon_test_helpers.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class IteratorWithException:
"""Wraps a simple iterable (i.e. list) so that it throws a ValueError on a particular index."""
diff --git a/scripts/Muon/GUI/Common/validate_errors.py b/scripts/Muon/GUI/Common/validate_errors.py
index c15c36a0d3b..5a00b93fdbc 100644
--- a/scripts/Muon/GUI/Common/validate_errors.py
+++ b/scripts/Muon/GUI/Common/validate_errors.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
def validateToErrors(alg):
errors = alg.validateInputs()
if not errors:
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
index 9f828c783aa..b510c34f3e6 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Detectors/detectors_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class DetectorsPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
index 10f0a73b813..24185597f7c 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/LineSelector/LineSelectorPresenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class LineSelectorPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
index 362e623aea4..e46b38ca45f 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/Peaks/peaks_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class PeaksPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
index faa9e8d6527..4fadfb61a88 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/PeakSelector/peak_selector_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class PeakSelectorPresenter(object):
def __init__(self, view):
self.view = view
diff --git a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
index 156aba8ede0..85acf76df96 100644
--- a/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
+++ b/scripts/Muon/GUI/FrequencyDomainAnalysis/TransformSelection/transform_selection_presenter.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
class TransformSelectionPresenter(object):
"""
diff --git a/scripts/Reflectometry/isis_reflectometry/quick.py b/scripts/Reflectometry/isis_reflectometry/quick.py
index 533dbf37377..df65076ccbe 100644
--- a/scripts/Reflectometry/isis_reflectometry/quick.py
+++ b/scripts/Reflectometry/isis_reflectometry/quick.py
@@ -25,6 +25,8 @@ from isis_reflectometry.convert_to_wavelength import ConvertToWavelength
import math
import re
import abc
+
+
def enum(**enums):
return type('Enum', (), enums)
diff --git a/scripts/SANS/sans/common/configurations.py b/scripts/SANS/sans/common/configurations.py
index db8f10dfdb1..2ed1353e419 100644
--- a/scripts/SANS/sans/common/configurations.py
+++ b/scripts/SANS/sans/common/configurations.py
@@ -7,6 +7,7 @@
""" The SANSConfigurations class holds instrument-specific configs to centralize instrument-specific magic numbers"""
# pylint: disable=too-few-public-methods
+
class Configurations(object):
class LARMOR(object):
diff --git a/scripts/SANS/sans/common/log_tagger.py b/scripts/SANS/sans/common/log_tagger.py
index cf7f842e70b..4d1ca1b00d4 100644
--- a/scripts/SANS/sans/common/log_tagger.py
+++ b/scripts/SANS/sans/common/log_tagger.py
@@ -10,6 +10,8 @@
from hashlib import sha224
from mantid.api import (MatrixWorkspace, WorkspaceGroup)
+
+
def get_hash_value(value):
"""
Converts a value into a hash
diff --git a/scripts/SANS/sans/gui_logic/plotting.py b/scripts/SANS/sans/gui_logic/plotting.py
index a942e2bb635..101114f3c55 100644
--- a/scripts/SANS/sans/gui_logic/plotting.py
+++ b/scripts/SANS/sans/gui_logic/plotting.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
def get_plotting_module():
"""
:returns: The plotting module to use. Can be None if Qt is not accessible.
diff --git a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
index 37248411d7b..713e20692be 100644
--- a/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
+++ b/scripts/SANS/sans/gui_logic/presenter/presenter_common.py
@@ -11,6 +11,8 @@ the view or retrieve them from the view
"""
from abc import ABCMeta, abstractmethod
+
+
class PresenterCommon(metaclass=ABCMeta):
def __init__(self, view, model):
self._view = view
diff --git a/scripts/SCD_Reduction/ReduceDictionary.py b/scripts/SCD_Reduction/ReduceDictionary.py
index 4f906666744..558d66775d4 100644
--- a/scripts/SCD_Reduction/ReduceDictionary.py
+++ b/scripts/SCD_Reduction/ReduceDictionary.py
@@ -19,6 +19,8 @@
# The run numbers themselves may be specified as a comma separated list of
# individual run numbers, or ranges specified with a colon separator.
#
+
+
def LoadDictionary( *filenames, **kwargs ):
# create a dictionary to load into
params_dictionary = kwargs.get("existing", {})
diff --git a/scripts/directtools/_validate.py b/scripts/directtools/_validate.py
index 76cbaf2978f..e69a20155fa 100644
--- a/scripts/directtools/_validate.py
+++ b/scripts/directtools/_validate.py
@@ -4,6 +4,8 @@
# NScD Oak Ridge National Laboratory, European Spallation Source,
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
+
+
def _isDOS(workspace):
"""Return True if workspace looks like a valid DOS workspace, False otherwise."""
singleHistogram = workspace.getNumberHistograms() == 1
diff --git a/scripts/test/Abins/AbinsBroadeningTest.py b/scripts/test/Abins/AbinsBroadeningTest.py
index 2e96b95116e..b40d3979bee 100644
--- a/scripts/test/Abins/AbinsBroadeningTest.py
+++ b/scripts/test/Abins/AbinsBroadeningTest.py
@@ -12,6 +12,7 @@ from scipy.stats import norm as spnorm
from AbinsModules.Instruments import Broadening
+
class AbinsBroadeningTest(unittest.TestCase):
"""
Test Abins broadening functions
diff --git a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
index 6e1338ed650..b7d07d67e5d 100644
--- a/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
+++ b/scripts/test/Abins/AbinsFrequencyPowderGeneratorTest.py
@@ -14,6 +14,7 @@ from mantid.simpleapi import logger
from AbinsModules import FrequencyPowderGenerator, AbinsParameters, AbinsConstants
from AbinsModules.AbinsConstants import INT_TYPE, FLOAT_TYPE
+
class AbinsFrequencyPowderGeneratorTest(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/AbsorptionShapesTest.py b/scripts/test/AbsorptionShapesTest.py
index 0c222317ec8..a5e76536f01 100644
--- a/scripts/test/AbsorptionShapesTest.py
+++ b/scripts/test/AbsorptionShapesTest.py
@@ -11,6 +11,7 @@ import unittest
import numpy as np
from Direct.AbsorptionShapes import (anAbsorptionShape,Cylinder,FlatPlate,HollowCylinder,Sphere)
+
class AbsorbtionShapesTest(unittest.TestCase):
def __init__(self, methodName):
return super(AbsorbtionShapesTest, self).__init__(methodName)
diff --git a/scripts/test/DirectEnergyConversionTest.py b/scripts/test/DirectEnergyConversionTest.py
index 9e302c44c02..5045fc6d1ef 100644
--- a/scripts/test/DirectEnergyConversionTest.py
+++ b/scripts/test/DirectEnergyConversionTest.py
@@ -17,6 +17,8 @@ import Direct.dgreduce as dgreduce
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
+
+
class DirectEnergyConversionTest(unittest.TestCase):
def __init__(self, methodName):
self.reducer = None
diff --git a/scripts/test/DirectReductionHelpersTest.py b/scripts/test/DirectReductionHelpersTest.py
index 865d81e3c27..7d2090fbb5e 100644
--- a/scripts/test/DirectReductionHelpersTest.py
+++ b/scripts/test/DirectReductionHelpersTest.py
@@ -10,6 +10,7 @@ from mantid import api
import unittest
import Direct.ReductionHelpers as helpers
+
class SomeDescriptor(object):
def __init__(self):
self._val=None
diff --git a/scripts/test/IndirectCommonTests.py b/scripts/test/IndirectCommonTests.py
index 1aa67fd0895..4bda6fde5de 100644
--- a/scripts/test/IndirectCommonTests.py
+++ b/scripts/test/IndirectCommonTests.py
@@ -16,6 +16,7 @@ import numpy as np
from mantid.simpleapi import *
import IndirectCommon as indirect_common
+
class IndirectCommonTests(unittest.TestCase):
_default_config = {}
diff --git a/scripts/test/Muon/LoadWidgetPresenter_test.py b/scripts/test/Muon/LoadWidgetPresenter_test.py
index 2706b6c9df6..ea31d27666a 100644
--- a/scripts/test/Muon/LoadWidgetPresenter_test.py
+++ b/scripts/test/Muon/LoadWidgetPresenter_test.py
@@ -14,6 +14,7 @@ from Muon.GUI.Common.load_widget.load_view import LoadView
from Muon.GUI.ElementalAnalysis.LoadWidget.load_model import LoadModel, CoLoadModel
from collections import OrderedDict
+
@start_qapplication
class LoadPresenterTest(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/Muon/elemental_analysis/load_utils_test.py b/scripts/test/Muon/elemental_analysis/load_utils_test.py
index d0cca4c3b82..3a812e303f7 100644
--- a/scripts/test/Muon/elemental_analysis/load_utils_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_utils_test.py
@@ -12,6 +12,8 @@ from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
import mantid.simpleapi as mantid
from mantid import config
import numpy as np
+
+
class LoadUtilsTest(unittest.TestCase):
def setUp(self):
self.test_path = r"test\path\to\ral012345.rooth2020.dat"
diff --git a/scripts/test/Muon/fft_presenter_context_interaction_test.py b/scripts/test/Muon/fft_presenter_context_interaction_test.py
index a3c392a722b..a3792a34535 100644
--- a/scripts/test/Muon/fft_presenter_context_interaction_test.py
+++ b/scripts/test/Muon/fft_presenter_context_interaction_test.py
@@ -19,6 +19,7 @@ from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_model
from Muon.GUI.Common.utilities.algorithm_utils import convert_to_field
+
def retrieve_combobox_info(combo_box):
output_list = []
for i in range(combo_box.count()):
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
index 0e7b0bfbf17..fe63c8a9ea0 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
@@ -20,6 +20,8 @@ from Muon.GUI.Common.test_helpers.context_setup import setup_context_for_tests
# this class is required to keep track of error signal emissions since the output is garbage collected by the time
# we reach the equal assertion
+
+
class MockSignalHandler(object):
def __init__(self, parent=None):
self.call_count = 0
@@ -27,6 +29,7 @@ class MockSignalHandler(object):
def signalReceived(self):
self.call_count+=1
+
@start_qapplication
class LoadRunWidgetLoadCurrentRunTest(unittest.TestCase):
def run_test_with_and_without_threading(test_function):
diff --git a/scripts/test/Muon/muon_gui_context_test.py b/scripts/test/Muon/muon_gui_context_test.py
index 30ecbfd3e39..81ae83f04d0 100644
--- a/scripts/test/Muon/muon_gui_context_test.py
+++ b/scripts/test/Muon/muon_gui_context_test.py
@@ -12,6 +12,7 @@ from mantid.py3compat import mock
from mantidqt.utils.observer_pattern import Observer
from mantidqt.utils.qt.testing import start_qapplication
+
@start_qapplication
class MuonGUIContextTest(unittest.TestCase):
def test_can_set_variables(self):
diff --git a/scripts/test/ReductionWrapperTest.py b/scripts/test/ReductionWrapperTest.py
index 85de738d5f0..e7a2b5e1a2e 100644
--- a/scripts/test/ReductionWrapperTest.py
+++ b/scripts/test/ReductionWrapperTest.py
@@ -17,6 +17,7 @@ import MariReduction as mr
import unittest
import imp
+
class test_helper(ReductionWrapper):
def __init__(self,web_var=None):
""" sets properties defaults for the instrument with Name"""
@@ -80,6 +81,8 @@ class test_helper(ReductionWrapper):
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------------------------
+
+
class ReductionWrapperTest(unittest.TestCase):
def __init__(self, methodName):
diff --git a/scripts/test/ReflectometryQuickAuxiliaryTest.py b/scripts/test/ReflectometryQuickAuxiliaryTest.py
index 28d07d86c8a..310b15c286e 100644
--- a/scripts/test/ReflectometryQuickAuxiliaryTest.py
+++ b/scripts/test/ReflectometryQuickAuxiliaryTest.py
@@ -9,6 +9,7 @@ import numpy
from mantid.simpleapi import *
from isis_reflectometry import quick
+
class ReflectometryQuickAuxiliaryTest(unittest.TestCase):
__wsName = None
diff --git a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
index 406560eced2..e9a62759759 100644
--- a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
@@ -179,6 +179,7 @@ def create_mocked_runs(start, len):
mock_instance.display_name.return_value = start + x
return run_selection
+
class BaseFileNameTest(AddRunsPagePresenterTestCase):
def setUp(self):
self.view = self._make_mock_view()
diff --git a/scripts/test/SANSCentreFinderTest.py b/scripts/test/SANSCentreFinderTest.py
index d25f810642c..cb635ea71c1 100644
--- a/scripts/test/SANSCentreFinderTest.py
+++ b/scripts/test/SANSCentreFinderTest.py
@@ -68,6 +68,7 @@ class SANSBeamCentrePositionUpdater(unittest.TestCase):
self.assertEqual(x_expected, x_new, "The x value should have been incremented.")
self.assertEqual(y_expected, y_new, "The y value should have been incremented.")
+
class TestPositionProvider(unittest.TestCase):
workspace_name = 'dummy_ws'
diff --git a/scripts/test/SANSCommandInterfaceTest.py b/scripts/test/SANSCommandInterfaceTest.py
index b077bf9449e..1fd68b67c5f 100644
--- a/scripts/test/SANSCommandInterfaceTest.py
+++ b/scripts/test/SANSCommandInterfaceTest.py
@@ -16,6 +16,7 @@ from mantid.kernel import DateAndTime
import random
import math
+
class SANSCommandInterfaceGetAndSetTransmissionSettings(unittest.TestCase):
def test_that_gets_transmission_monitor(self):
# Arrange
@@ -202,6 +203,7 @@ class SANSCommandInterfaceGetAndSetTransmissionSettings(unittest.TestCase):
# Assert
self.assertEqual(0, len(ReductionSingleton().transmission_calculator.mask_files), 'The transmission mask list should be empty.')
+
class TestEventWorkspaceCheck(unittest.TestCase):
def _create_file_name(self, name):
temp_save_dir = config['defaultsave.directory']
@@ -236,6 +238,7 @@ class TestEventWorkspaceCheck(unittest.TestCase):
self._clean_up(file_name)
DeleteWorkspace(ws)
+
class SANSCommandInterfaceGetAndSetQResolutionSettings(unittest.TestCase):
#Test the input and output mechanims for the QResolution settings
def test_full_setup_for_circular_apertures(self):
@@ -363,6 +366,7 @@ class SANSCommandInterfaceGetAndSetQResolutionSettings(unittest.TestCase):
delta_r_expected = delta_r/1000.
self.assertEqual(delta_r_stored, delta_r_expected)
+
class TestLARMORCommand(unittest.TestCase):
def test_that_default_idf_is_being_selected(self):
command_iface.Clean()
@@ -396,6 +400,7 @@ class TestLARMORCommand(unittest.TestCase):
self.assertFalse(command_iface.LARMOR(selected_idf),
"A non existent idf path should return false")
+
class TestMaskFile(unittest.TestCase):
def test_throws_for_user_file_with_invalid_extension(self):
# Arrange
@@ -406,6 +411,7 @@ class TestMaskFile(unittest.TestCase):
args = [file_name]
self.assertRaises(RuntimeError, command_iface.MaskFile, *args)
+
class SANSCommandInterfaceGetAndSetBackgroundCorrectionSettings(unittest.TestCase):
def _do_test_correct_setting(self, run_number, is_time, is_mon, is_mean, mon_numbers):
# Assert that settings were set
diff --git a/scripts/test/SANSIsisInstrumentTest.py b/scripts/test/SANSIsisInstrumentTest.py
index 907ef3d0890..38f8b679f17 100644
--- a/scripts/test/SANSIsisInstrumentTest.py
+++ b/scripts/test/SANSIsisInstrumentTest.py
@@ -40,6 +40,7 @@ class SANSIsisInstrumentTest(unittest.TestCase):
self.assertEqual(None, start_Tof)
self.assertEqual(None, end_Tof)
+
class TestParameterMapModifications(unittest.TestCase):
def create_sample_workspace(self, ws_name, types, values, names):
ws = CreateSampleWorkspace(OutputWorkspace = ws_name)
diff --git a/scripts/test/SANSReductionStepsUserFileTest.py b/scripts/test/SANSReductionStepsUserFileTest.py
index b24ca388c98..fdda1df601f 100644
--- a/scripts/test/SANSReductionStepsUserFileTest.py
+++ b/scripts/test/SANSReductionStepsUserFileTest.py
@@ -110,6 +110,7 @@ class SANSReductionStepsUserFileTest(unittest.TestCase):
self.assertEqual(merge_Range.q_max, None, 'The q_max should have been read in')
self.assertEqual(merge_Range.q_merge_range, False, 'q_merge_range should be true')
+
class MockConvertTOQISISQResolution(object):
def __init__(self):
super(MockConvertTOQISISQResolution, self).__init__()
@@ -151,11 +152,13 @@ class MockConvertTOQISISQResolution(object):
def set_use_q_resolution(self, enabled):
self.on_off = enabled
+
class MockReducerQResolution(object):
def __init__(self):
super(MockReducerQResolution, self).__init__()
self.to_Q = MockConvertTOQISISQResolution()
+
class TestQResolutionInUserFile(unittest.TestCase):
def test_that_good_input_is_accepted(self):
# Arrange
diff --git a/scripts/test/SANSUtilityTest.py b/scripts/test/SANSUtilityTest.py
index 6560873b7fb..632f7c3f4f2 100644
--- a/scripts/test/SANSUtilityTest.py
+++ b/scripts/test/SANSUtilityTest.py
@@ -31,11 +31,13 @@ TEST_STRING_MON2 = TEST_STRING_MON + '_2'
TEST_STRING_DATA3 = TEST_STRING_DATA + '_3'
TEST_STRING_MON3 = TEST_STRING_MON + '_3'
+
def provide_group_workspace_for_added_event_data(event_ws_name, monitor_ws_name, out_ws_name):
CreateWorkspace(DataX = [1,2,3], DataY = [2,3,4], OutputWorkspace = monitor_ws_name)
CreateSampleWorkspace(WorkspaceType= 'Event', OutputWorkspace = event_ws_name)
GroupWorkspaces(InputWorkspaces = [event_ws_name, monitor_ws_name ], OutputWorkspace = out_ws_name)
+
def addSampleLogEntry(log_name, ws, start_time, extra_time_shift, make_linear = False):
number_of_times = 10
for i in range(0, number_of_times):
@@ -48,6 +50,7 @@ def addSampleLogEntry(log_name, ws, start_time, extra_time_shift, make_linear =
date += int(extra_time_shift*1e9)
AddTimeSeriesLog(ws, Name=log_name, Time=date.__str__().strip(), Value=val)
+
def provide_event_ws_with_entries(name, start_time,number_events =0, extra_time_shift = 0.0, proton_charge = True, proton_charge_empty = False, log_names= None, make_linear = False):
# Create the event workspace
ws = CreateSampleWorkspace(WorkspaceType= 'Event', NumEvents = number_events, OutputWorkspace = name)
@@ -67,17 +70,21 @@ def provide_event_ws_with_entries(name, start_time,number_events =0, extra_time_
addSampleLogEntry(name, ws, start_time, extra_time_shift, make_linear)
return ws
+
def provide_event_ws_custom(name, start_time, extra_time_shift = 0.0, proton_charge = True, proton_charge_empty = False):
return provide_event_ws_with_entries(name=name, start_time=start_time,
number_events = 100, extra_time_shift = extra_time_shift,
proton_charge=proton_charge, proton_charge_empty=proton_charge_empty)
+
def provide_event_ws(name, start_time, extra_time_shift):
return provide_event_ws_custom(name = name, start_time = start_time, extra_time_shift = extra_time_shift, proton_charge = True)
+
def provide_event_ws_wo_proton_charge(name, start_time, extra_time_shift):
return provide_event_ws_custom(name = name, start_time = start_time, extra_time_shift = extra_time_shift, proton_charge = False)
+
def provide_histo_workspace_with_one_spectrum(ws_name, x_start, x_end, bin_width):
CreateSampleWorkspace(OutputWorkspace = ws_name,
NumBanks=1,
@@ -203,6 +210,7 @@ class SANSUtilityTest(unittest.TestCase):
self.assertEqual([[1, 3], [5, 5], [7, 9]], su._merge_to_ranges([1, 2, 3, 5, 7, 8, 9]))
self.assertEqual([[1, 1]], su._merge_to_ranges([1]))
+
class TestBundleAddedEventDataFilesToGroupWorkspaceFile(unittest.TestCase):
def _prepare_workspaces(self, names):
CreateSampleWorkspace(WorkspaceType = 'Event', OutputWorkspace = names[0])
@@ -257,6 +265,7 @@ class TestBundleAddedEventDataFilesToGroupWorkspaceFile(unittest.TestCase):
if os.path.exists(file_names[0]):
os.remove(file_names[0])
+
class TestLoadingAddedEventWorkspaceNameParsing(unittest.TestCase):
def do_test_load_check(self, event_name, monitor_name):
@@ -322,6 +331,7 @@ class TestLoadingAddedEventWorkspaceNameParsing(unittest.TestCase):
monitor_name3 = TEST_STRING_MON3
self.do_test_load_check(event_name = event_name3, monitor_name = monitor_name3)
+
class TestLoadingAddedEventWorkspaceExtraction(unittest.TestCase):
_appendix = '_monitors'
@@ -566,6 +576,7 @@ class TestCombineWorkspacesFactory(unittest.TestCase):
alg = factory.create_add_algorithm(False)
self.assertTrue(isinstance(alg, su.PlusWorkspaces))
+
class TestOverlayWorkspaces(unittest.TestCase):
def test_time_from_proton_charge_log_is_recovered(self):
# Arrange
@@ -648,6 +659,7 @@ class TestOverlayWorkspaces(unittest.TestCase):
if name in mtd.getObjectNames():
DeleteWorkspace(name)
+
class TestTimeShifter(unittest.TestCase):
def test_zero_shift_when_out_of_range(self):
# Arrange
@@ -671,6 +683,7 @@ class TestTimeShifter(unittest.TestCase):
self.assertEqual(time_shifter.get_Nth_time_shift(2), -232.0)
self.assertEqual(time_shifter.get_Nth_time_shift(3), 0.0)
+
class TestZeroErrorFreeWorkspace(unittest.TestCase):
def _setup_workspace(self, name, type):
ws = CreateSampleWorkspace(OutputWorkspace = name, WorkspaceType=type, Function='One Peak',NumBanks=1,BankPixelWidth=2,NumEvents=0,XMin=0.5,XMax=1,BinWidth=1,PixelSpacing=1,BankDistanceFromSample=1)
@@ -855,6 +868,7 @@ class TestRenameMonitorsForMultiPeriodEventData(unittest.TestCase):
if element in mtd:
DeleteWorkspace(element)
+
class TestConvertibleToInteger(unittest.TestCase):
def test_converts_true_to_integer_when_integer(self):
# Arrange
@@ -880,6 +894,7 @@ class TestConvertibleToInteger(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestConvertibleToFloat(unittest.TestCase):
def test_converts_true_to_float_when_float(self):
# Arrange
@@ -905,6 +920,7 @@ class TestConvertibleToFloat(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestValidXmlFileList(unittest.TestCase):
def test_finds_valid_xml_file_list(self):
# Arrange
@@ -930,6 +946,7 @@ class TestValidXmlFileList(unittest.TestCase):
# Assert
self.assertFalse(result)
+
class TestConvertToAndFromPythonStringList(unittest.TestCase):
def test_converts_from_string_to_list(self):
# Arrange
@@ -948,6 +965,7 @@ class TestConvertToAndFromPythonStringList(unittest.TestCase):
expected = "test1.xml,test2.xml,test3.xml"
self.assertEqual(expected, result)
+
class HelperRescaleShift(object):
def __init__(self, hasValues=True, min= 1, max= 2):
super(HelperRescaleShift, self).__init__()
@@ -955,6 +973,7 @@ class HelperRescaleShift(object):
self.qMin = min
self.qMax = max
+
class TestExtractionOfQRange(unittest.TestCase):
def _delete_workspace(self, workspace_name):
if workspace_name in mtd:
@@ -1245,6 +1264,7 @@ class TestGetQResolutionForMergedWorkspaces(unittest.TestCase):
DeleteWorkspace(rear)
DeleteWorkspace(result)
+
class TestDetectingValidUserFileExtensions(unittest.TestCase):
def _do_test(self, file_name, expected):
result = su.is_valid_user_file_extension(file_name)
diff --git a/scripts/test/SansIsisGuiSettings.py b/scripts/test/SansIsisGuiSettings.py
index 5f7ed6b84c8..24bfa5e946b 100644
--- a/scripts/test/SansIsisGuiSettings.py
+++ b/scripts/test/SansIsisGuiSettings.py
@@ -10,6 +10,7 @@ import ISISCommandInterface as i
MASKFILE = 'MaskSANS2D.txt'
+
class Sans2DIsisGuiSettings(unittest.TestCase):
def setUp(self):
diff --git a/scripts/test/SettingsTest.py b/scripts/test/SettingsTest.py
index fd0b4efc261..ba54d97a173 100644
--- a/scripts/test/SettingsTest.py
+++ b/scripts/test/SettingsTest.py
@@ -14,6 +14,8 @@ RAII Test helper class. Equivalent to the ScopedFileHelper.
If this proves useful. It would be sensible to make it more accessible for other testing classes.
'''
+
+
class TempFile(object):
__tempFile = None
@@ -37,6 +39,8 @@ class TempFile(object):
'''
Determine if all tests should be skipped. Check for the expat module to decide.
'''
+
+
def skipAllTests():
skiptests = False
try:
--
GitLab
From 7fd7cb400091679b7879d42475e41a375177f119 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 13:54:40 +0000
Subject: [PATCH 30/37] RE #27722 Fix blank line at EOF W391
---
Framework/PythonInterface/mantid/api/__init__.py | 1 -
Framework/PythonInterface/mantid/plots/_compatability.py | 1 -
Framework/PythonInterface/mantid/plots/mantidaxes.py | 2 +-
Framework/PythonInterface/mantid/plots/plotfunctions.py | 2 --
.../test/python/mantid/api/IPeaksWorkspaceTest.py | 2 --
.../test/python/mantid/api/MDEventWorkspaceTest.py | 1 -
.../test/python/mantid/api/MDHistoWorkspaceTest.py | 2 --
.../test/python/mantid/geometry/OrientedLatticeTest.py | 2 +-
.../test/python/mantid/geometry/PeakShapeTest.py | 2 +-
.../test/python/mantid/geometry/SymmetryOperationTest.py | 2 +-
.../test/python/mantid/kernel/InstrumentInfoTest.py | 1 -
.../test/python/mantid/kernel/LiveListenerInfoTest.py | 1 -
.../test/python/mantid/kernel/OptionalBoolTest.py | 1 -
Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py | 2 +-
Framework/PythonInterface/test/python/mantid/plots/__init__.py | 1 -
.../plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py | 2 +-
.../plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py | 2 +-
.../test/python/plugins/algorithms/ExportExperimentLogTest.py | 1 -
.../test/python/plugins/algorithms/FilterLogByTimeTest.py | 2 +-
.../test/python/plugins/algorithms/MergeCalFilesTest.py | 2 +-
.../test/python/plugins/algorithms/PoldiMergeTest.py | 2 +-
.../test/python/plugins/algorithms/SANSSubtractTest.py | 2 +-
.../python/plugins/algorithms/SANSWideAngleCorrectionTest.py | 1 -
.../python/plugins/algorithms/SelectNexusFilesByMetadataTest.py | 1 -
.../python/plugins/algorithms/VelocityAutoCorrelationsTest.py | 2 +-
.../python/plugins/algorithms/VelocityCrossCorrelationsTest.py | 2 +-
.../test/python/plugins/algorithms/VesuvioPreFitTest.py | 1 -
.../algorithms/WorkflowAlgorithms/IndirectResolutionTest.py | 2 +-
.../WorkflowAlgorithms/ReflectometryILL_commonTest.py | 2 +-
.../test/python/plugins/functions/StretchedExpFTTest.py | 1 -
buildconfig/class_maker.py | 2 +-
.../workbench/plotting/plotscriptgenerator/test/__init__.py | 1 -
qt/python/mantidqt/dialogs/test/__init__.py | 1 -
.../widgets/plotconfigdialog/axestabwidget/test/__init__.py | 1 -
.../curvestabwidget/errorbarstabwidget/__init__.py | 1 -
.../plotconfigdialog/curvestabwidget/linetabwidget/__init__.py | 1 -
.../curvestabwidget/markertabwidget/__init__.py | 1 -
.../widgets/plotconfigdialog/curvestabwidget/test/__init__.py | 1 -
.../widgets/plotconfigdialog/imagestabwidget/test/__init__.py | 1 -
.../widgets/plotconfigdialog/legendtabwidget/__init__.py | 1 -
.../legendtabwidget/advancedlegendoptionsdialog/__init__.py | 1 -
qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py | 1 -
.../mantidqt/widgets/waterfallplotfillareadialog/__init__.py | 1 -
.../widgets/waterfallplotfillareadialog/test/__init__.py | 1 -
.../mantidqt/widgets/waterfallplotoffsetdialog/__init__.py | 1 -
.../mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py | 1 -
scripts/test/DirectReductionHelpersTest.py | 1 -
scripts/test/Muon/muon_data_context_test.py | 2 +-
scripts/test/ReductionWrapperTest.py | 1 -
scripts/test/SANS/common/xml_parsing_test.py | 2 --
scripts/test/SANS/state/save_test.py | 2 +-
51 files changed, 18 insertions(+), 55 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/__init__.py b/Framework/PythonInterface/mantid/api/__init__.py
index b8ec63ff618..bf2877e0a6c 100644
--- a/Framework/PythonInterface/mantid/api/__init__.py
+++ b/Framework/PythonInterface/mantid/api/__init__.py
@@ -40,4 +40,3 @@ from mantid.api import _adsimports
# Make aliases accessible in this namespace
###############################################################################
from mantid.api._aliases import *
-
diff --git a/Framework/PythonInterface/mantid/plots/_compatability.py b/Framework/PythonInterface/mantid/plots/_compatability.py
index 9c6ca66fe14..131fa3ccbf9 100644
--- a/Framework/PythonInterface/mantid/plots/_compatability.py
+++ b/Framework/PythonInterface/mantid/plots/_compatability.py
@@ -97,4 +97,3 @@ def _report_deprecated_parameter(param_name,param_value):
"""Logs a warning message if the parameter value is not None"""
if param_value is not None:
LOGGER.warning("The argument '{}' is not supported in workbench and has been ignored".format(param_name))
-
diff --git a/Framework/PythonInterface/mantid/plots/mantidaxes.py b/Framework/PythonInterface/mantid/plots/mantidaxes.py
index 5ca0b07533f..e2951e1e6dd 100644
--- a/Framework/PythonInterface/mantid/plots/mantidaxes.py
+++ b/Framework/PythonInterface/mantid/plots/mantidaxes.py
@@ -1379,4 +1379,4 @@ class _WorkspaceArtists(object):
if isinstance(artists, Container) or not isinstance(artists, Iterable):
self._artists = [artists]
else:
- self._artists = artists
\ No newline at end of file
+ self._artists = artists
diff --git a/Framework/PythonInterface/mantid/plots/plotfunctions.py b/Framework/PythonInterface/mantid/plots/plotfunctions.py
index 5a006ecbafd..e48ddff957d 100644
--- a/Framework/PythonInterface/mantid/plots/plotfunctions.py
+++ b/Framework/PythonInterface/mantid/plots/plotfunctions.py
@@ -370,5 +370,3 @@ def _do_single_plot(ax, workspaces, errors, set_title, nums, kw, plot_kwargs):
if set_title:
title = workspaces[0].name()
ax.set_title(title)
-
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
index 6ada3160ecc..fe696ac1832 100644
--- a/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/IPeaksWorkspaceTest.py
@@ -139,5 +139,3 @@ class IPeaksWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
index 6c92b7e6e6c..e62584c56aa 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDEventWorkspaceTest.py
@@ -34,4 +34,3 @@ class MDEventWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
index 6b62bfe4aeb..e39be7385fe 100644
--- a/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/MDHistoWorkspaceTest.py
@@ -275,5 +275,3 @@ class MDHistoWorkspaceTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
index 133732fa9a5..1398d38b4ba 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/OrientedLatticeTest.py
@@ -86,4 +86,4 @@ class OrientedLatticeTest(unittest.TestCase):
self.assertTrue(isinstance( ol.hklFromQ(np.array([1,1,1])), V3D), "Should work with numpy array input" )
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
index e6b05f1e6c2..8beaea9efd9 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/PeakShapeTest.py
@@ -21,4 +21,4 @@ class PeakShapeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
index 1df03bcb0cd..953363a0632 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/SymmetryOperationTest.py
@@ -32,4 +32,4 @@ class SymmetryOperationTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
index 08d8edd0902..aac1df11cb7 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/InstrumentInfoTest.py
@@ -42,4 +42,3 @@ class InstrumentInfoTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
index 37926bbb786..cd17f67543a 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/LiveListenerInfoTest.py
@@ -27,4 +27,3 @@ class LiveListenerInfoTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
index 4207537d8ae..da4483b9a3b 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/OptionalBoolTest.py
@@ -30,4 +30,3 @@ class OptionalBoolTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
index 7a7c6a150b1..de4f77a37b0 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/QuatTest.py
@@ -73,4 +73,4 @@ class QuatTest(unittest.TestCase):
self.assertEqual(v, V3D(a, a, 0))
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/mantid/plots/__init__.py b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/__init__.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
index 69bbe7e95c3..466e2c22ac7 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsSingleAxisTest.py
@@ -27,4 +27,4 @@ class AngularAutoCorrelationsSingleAxisTest(unittest.TestCase):
self.assertAlmostEqual(output_ws.blocksize(), 501)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
index 6a8a456de61..72703e50255 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/AngularAutoCorrelationsTwoAxesTest.py
@@ -27,4 +27,4 @@ class AngularAutoCorrelationsTwoAxesTest(unittest.TestCase):
self.assertAlmostEqual(output_ws.blocksize(), 501)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
index 667d9c27839..120605c129a 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/ExportExperimentLogTest.py
@@ -741,4 +741,3 @@ class ExportExperimentLogTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
index 213c0f8b08a..d47004e7a84 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/FilterLogByTimeTest.py
@@ -130,4 +130,4 @@ class FilterLogByTimeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
index c990742faa4..9a5624ca5e4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/MergeCalFilesTest.py
@@ -201,4 +201,4 @@ class MergeCalFilesTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
index 5ecdad32819..fa1622d8c1c 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/PoldiMergeTest.py
@@ -101,4 +101,4 @@ class PoldiMergeTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
index 2072ca54107..4d4a24d31ad 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSSubtractTest.py
@@ -42,4 +42,4 @@ class SANSSubtractTest(unittest.TestCase):
self.assertAlmostEqual(value, 0, 2)
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
index 262117d691a..a6f7feeb7b3 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SANSWideAngleCorrectionTest.py
@@ -66,4 +66,3 @@ class SANSWideAngleCorrectionTest(unittest.TestCase):
if __name__ == "__main__":
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
index add3c3bf312..ea3cafdadee 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SelectNexusFilesByMetadataTest.py
@@ -77,4 +77,3 @@ if __name__=="__main__":
unittest.main()
except ImportError:
pass
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
index e5034dcf812..a645fbbebb4 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityAutoCorrelationsTest.py
@@ -23,4 +23,4 @@ class VelocityAutoCorrelationsTest(unittest.TestCase):
self.assertAlmostEqual(data_y[0], 0.000247266521347895)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
index 6bab314aead..c3e6afa6a10 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VelocityCrossCorrelationsTest.py
@@ -25,4 +25,4 @@ class VelocityCrossCorrelationsTest(unittest.TestCase):
self.assertAlmostEqual(data_y[0], -8.76322385197998e-05)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
index 2502983b640..6e1a574f3ec 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/VesuvioPreFitTest.py
@@ -131,4 +131,3 @@ class VesuvioPreFitTest(unittest.TestCase):
if __name__ == "__main__":
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
index 1c0dac861ed..34fee500d84 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/IndirectResolutionTest.py
@@ -57,4 +57,4 @@ class IndirectResolutionTest(unittest.TestCase):
self.assertTrue(res_ws.run().getProperty('current_period').value, 1)
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
index 2ba2e7ef0fb..406bf6ac49f 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryILL_commonTest.py
@@ -31,4 +31,4 @@ class ReflectometryILL_commonTest(unittest.TestCase):
if __name__ == "__main__":
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
index 7e4a7a66987..1b507010c98 100644
--- a/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
+++ b/Framework/PythonInterface/test/python/plugins/functions/StretchedExpFTTest.py
@@ -43,4 +43,3 @@ class StretchedExpFTTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
diff --git a/buildconfig/class_maker.py b/buildconfig/class_maker.py
index cead3367714..4a3274ef050 100755
--- a/buildconfig/class_maker.py
+++ b/buildconfig/class_maker.py
@@ -393,4 +393,4 @@ if __name__ == "__main__":
if args.subfolder[-1:] != "/":
args.subfolder += "/"
- generate(subproject, classname, overwrite, args)
\ No newline at end of file
+ generate(subproject, classname, overwrite, args)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/dialogs/test/__init__.py b/qt/python/mantidqt/dialogs/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/dialogs/test/__init__.py
+++ b/qt/python/mantidqt/dialogs/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/errorbarstabwidget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/linetabwidget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/markertabwidget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/advancedlegendoptionsdialog/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
index 0d598d946f0..4370b7d972d 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
index 79671b71fbc..b4bf0064ff3 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
index 0d598d946f0..4370b7d972d 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/__init__.py
@@ -5,4 +5,3 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-
diff --git a/scripts/test/DirectReductionHelpersTest.py b/scripts/test/DirectReductionHelpersTest.py
index 7d2090fbb5e..f0476b45108 100644
--- a/scripts/test/DirectReductionHelpersTest.py
+++ b/scripts/test/DirectReductionHelpersTest.py
@@ -530,4 +530,3 @@ class DirectReductionHelpersTest(unittest.TestCase):
if __name__=="__main__":
unittest.main()
-
diff --git a/scripts/test/Muon/muon_data_context_test.py b/scripts/test/Muon/muon_data_context_test.py
index 8a85f13df26..3d1c392cfa3 100644
--- a/scripts/test/Muon/muon_data_context_test.py
+++ b/scripts/test/Muon/muon_data_context_test.py
@@ -90,4 +90,4 @@ class MuonDataContextTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main(buffer=False, verbosity=2)
\ No newline at end of file
+ unittest.main(buffer=False, verbosity=2)
diff --git a/scripts/test/ReductionWrapperTest.py b/scripts/test/ReductionWrapperTest.py
index e7a2b5e1a2e..3856b3b88c5 100644
--- a/scripts/test/ReductionWrapperTest.py
+++ b/scripts/test/ReductionWrapperTest.py
@@ -308,4 +308,3 @@ class ReductionWrapperTest(unittest.TestCase):
if __name__=="__main__":
unittest.main()
-
diff --git a/scripts/test/SANS/common/xml_parsing_test.py b/scripts/test/SANS/common/xml_parsing_test.py
index 7f2f84b48ea..4b3796c3ce1 100644
--- a/scripts/test/SANS/common/xml_parsing_test.py
+++ b/scripts/test/SANS/common/xml_parsing_test.py
@@ -87,5 +87,3 @@ class XMLParsingTest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
-
diff --git a/scripts/test/SANS/state/save_test.py b/scripts/test/SANS/state/save_test.py
index 51ac9901c96..b68f555f9d8 100644
--- a/scripts/test/SANS/state/save_test.py
+++ b/scripts/test/SANS/state/save_test.py
@@ -50,4 +50,4 @@ class StateReductionBuilderTest(unittest.TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
--
GitLab
From 0bdcd86ed5b350421d350f5f7e829948e20c8de5 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 14:47:04 +0000
Subject: [PATCH 31/37] RE #27722 Format over and under indented lines E128
E127
---
.../isis_powder/test/ISISPowderInstrumentSettingsTest.py | 2 +-
.../Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py | 2 +-
.../Diffraction/isis_powder/test/ISISPowderYamlParserTest.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
index 1dff03e963f..1c6966ae8e6 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
@@ -156,7 +156,7 @@ class ISISPowderInstrumentSettingsTest(unittest.TestCase):
def test_param_map_rejects_enum_missing_friendly_name(self):
# Check that is the friendly name is not set it is correctly detected
with self.assertRaisesRegex(RuntimeError,
- "'enum_friendly_name' was not set. Please contact development team."):
+ "'enum_friendly_name' was not set. Please contact development team."):
param_map_entry.ParamMapEntry(ext_name="user_facing_name", int_name="script_facing_name",
enum_class=BadSampleEnum)
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
index 69cfd61f101..d9bd971cdcc 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
@@ -193,7 +193,7 @@ class ISISPowderSampleDetailsTest(unittest.TestCase):
material_obj = sample_details._Material(chemical_formula='V')
with self.assertRaisesRegex(ValueError, "absorption_cross_section was: -1 which is impossible for a physical "
- "object"):
+ "object"):
material_obj.set_material_properties(abs_cross_sect=bad_absorb, scattering_cross_sect=good_scattering)
# Check the immutability flag has not been set on a failure
diff --git a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
index 8fa884689f9..7efd940a530 100644
--- a/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
+++ b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
@@ -151,7 +151,7 @@ class ISISPowderYamlParserTest(unittest.TestCase):
file_handle.close()
with self.assertRaisesRegex(ValueError, "Found a run range in calibration mapping overlaps an unbounded run "
- "range"):
+ "range"):
yaml_parser.get_run_dictionary(run_number_string="32", file_path=file_path)
--
GitLab
From 5a6f9f412f1922cc11f9c9c51416c4655469fff9 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 11 Mar 2020 14:50:20 +0000
Subject: [PATCH 32/37] RE #27722 Fix too many blank lines E303
---
qt/python/mantidqt/widgets/codeeditor/test/test_execution.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
index 27466d91671..2729d2d6f1b 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
@@ -20,7 +20,6 @@ from qtpy.QtCore import QCoreApplication, QObject
from io import StringIO
from mantid.py3compat.mock import patch, Mock
-
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.execution import PythonCodeExecution, _get_imported_from_future
--
GitLab
From ac9b8e4896574f4af7c757d47d30e6897ab6d676 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 24 Mar 2020 16:55:12 +0000
Subject: [PATCH 33/37] RE #27722 Fix removal of systemtest inheritance
Accidentally removed inheritance of systemtesting.MantidSystemTest when
removing with_metaclass and add_metaclass. Put them back.
---
Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py | 2 +-
Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py | 2 +-
Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py | 2 +-
Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py | 2 +-
Testing/SystemTests/tests/analysis/LoadAndCheckBase.py | 2 +-
Testing/SystemTests/tests/analysis/ReflectometryISIS.py | 2 +-
Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index 9005d12dd5d..6587db51b76 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -82,7 +82,7 @@ from mantid.api import FileFinder
from systemtesting import MantidSystemTest, using_gsl_v1
-class ISISIndirectInelasticBase(metaclass=ABCMeta):
+class ISISIndirectInelasticBase(MantidSystemTest, metaclass=ABCMeta):
'''
A common base class for the ISISIndirectInelastic* base classes.
'''
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index 327f8e4cb87..09bf72ffcf8 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod
#----------------------------------------------------------------------
-class ISISMuonAnalysis(metaclass=ABCMeta):
+class ISISMuonAnalysis(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index d38268982da..92b7967f8b8 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -12,7 +12,7 @@ from abc import ABCMeta, abstractmethod
#----------------------------------------------------------------------
-class ISISMuonAnalysisGrouping(metaclass=ABCMeta):
+class ISISMuonAnalysisGrouping(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index 93718543151..0fe57b9fbb8 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -15,7 +15,7 @@ import os
from abc import ABCMeta, abstractmethod
-class ISISReflInstrumentIDFTest(metaclass=ABCMeta):
+class ISISReflInstrumentIDFTest(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod
def get_IDF_name(self):
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 8925de62e64..fd4450316a7 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -16,7 +16,7 @@ import mantid.api
from abc import ABCMeta, abstractmethod
-class LoadAndCheckBase(metaclass=ABCMeta):
+class LoadAndCheckBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
__comparison_out_workspace_name = 'a_integrated'
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 2ef9bc88442..a03127c0595 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -15,7 +15,7 @@ from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
-class ReflectometryISIS(metaclass=ABCMeta):
+class ReflectometryISIS(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod
def get_workspace_name(self):
diff --git a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
index 815b49c801b..7f44cf648c3 100644
--- a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
+++ b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
@@ -20,7 +20,7 @@ def create_file_path(base_name):
return filename
-class SaveLoadNexusProcessedTestBase(metaclass=ABCMeta):
+class SaveLoadNexusProcessedTestBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
filename = None
test_ws_name = 'input_ws'
--
GitLab
From 99cb54730f141905ae7393186ad611453e6e77d7 Mon Sep 17 00:00:00 2001
From: Conor Finn <cf338@kent.ac.uk>
Date: Wed, 25 Mar 2020 12:47:54 +0000
Subject: [PATCH 34/37] RE #27722 Update test to account for bytes instead of
str
---
scripts/test/SANS/gui_logic/state_gui_model_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/test/SANS/gui_logic/state_gui_model_test.py b/scripts/test/SANS/gui_logic/state_gui_model_test.py
index c711459b71b..af08b415af6 100644
--- a/scripts/test/SANS/gui_logic/state_gui_model_test.py
+++ b/scripts/test/SANS/gui_logic/state_gui_model_test.py
@@ -317,7 +317,7 @@ class StateGuiModelTest(unittest.TestCase):
state_gui_model.q_1d_rebin_string = b"test"
q_1d_rebin_string = state_gui_model.q_1d_rebin_string
- self.assertEqual(type(q_1d_rebin_string), str)
+ self.assertEqual(type(q_1d_rebin_string), bytes)
self.assertEqual(q_1d_rebin_string, "test")
# ------------------------------------------------------------------------------------------------------------------
--
GitLab
From bda9c00a28f8446b27ea346d1ff50c1d4d6a94fd Mon Sep 17 00:00:00 2001
From: Conor Finn <cf338@kent.ac.uk>
Date: Wed, 25 Mar 2020 13:14:32 +0000
Subject: [PATCH 35/37] RE #27722 Update async tests to account for new line
numbers
The tests include a check for the line numbers that an error occurs
on. The removal of the import future has reduced these values by 2.
---
qt/python/mantidqt/utils/test/test_async.py | 8 ++++----
scripts/test/SANS/gui_logic/state_gui_model_test.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/qt/python/mantidqt/utils/test/test_async.py b/qt/python/mantidqt/utils/test/test_async.py
index 896900555a8..6d69ad2508f 100644
--- a/qt/python/mantidqt/utils/test/test_async.py
+++ b/qt/python/mantidqt/utils/test/test_async.py
@@ -106,9 +106,9 @@ class AsyncTaskTest(unittest.TestCase):
self.assertEqual(2, len(recv.task_exc_stack))
# line number of self.target in asynchronous.py
- self.assertEqual(67, recv.task_exc_stack[0][1])
+ self.assertEqual(65, recv.task_exc_stack[0][1])
# line number of raise statement above
- self.assertEqual(95, recv.task_exc_stack[1][1])
+ self.assertEqual(93, recv.task_exc_stack[1][1])
def test_unsuccessful_args_and_kwargs_operation_calls_error_and_finished_callback(self):
def foo(scale, shift):
@@ -141,8 +141,8 @@ class AsyncTaskTest(unittest.TestCase):
self.assertTrue(recv.error_cb_called)
self.assertTrue(isinstance(recv.task_exc, RuntimeError))
self.assertEqual(3, len(recv.task_exc_stack))
- self.assertEqual(135, recv.task_exc_stack[1][1])
- self.assertEqual(134, recv.task_exc_stack[2][1])
+ self.assertEqual(133, recv.task_exc_stack[1][1])
+ self.assertEqual(132, recv.task_exc_stack[2][1])
# ---------------------------------------------------------------
# Failure cases
diff --git a/scripts/test/SANS/gui_logic/state_gui_model_test.py b/scripts/test/SANS/gui_logic/state_gui_model_test.py
index af08b415af6..a74cc8ae89b 100644
--- a/scripts/test/SANS/gui_logic/state_gui_model_test.py
+++ b/scripts/test/SANS/gui_logic/state_gui_model_test.py
@@ -318,7 +318,7 @@ class StateGuiModelTest(unittest.TestCase):
q_1d_rebin_string = state_gui_model.q_1d_rebin_string
self.assertEqual(type(q_1d_rebin_string), bytes)
- self.assertEqual(q_1d_rebin_string, "test")
+ self.assertEqual(q_1d_rebin_string, b"test")
# ------------------------------------------------------------------------------------------------------------------
# Gravity
--
GitLab
From a287f60e9d465795cafcccfc89db4850d342d4d5 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 30 Mar 2020 12:12:54 +0100
Subject: [PATCH 36/37] RE #27722 Remove py3compat init file code
---
.../mantid/py3compat/__init__.py | 99 -------------------
1 file changed, 99 deletions(-)
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
index cc064739466..c599abab0b8 100644
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ b/Framework/PythonInterface/mantid/py3compat/__init__.py
@@ -6,102 +6,3 @@
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
#
-#
-"""
-mantid.py3compat
-------------------
-
-Transitional module providing compatibility functions intended to help
-migrating from Python 2 to Python 3. Mostly just wraps six but allowing
-for additional functionality of our own.
-
-This module should be fully compatible with:
- * Python >=v2.7
- * Python 3
-"""
-
-import inspect
-import six
-from six import * # noqa
-import sys
-
-# Enumerations are built in with Python 3
-try:
- from enum import Enum
-except ImportError:
- # use a compatability layer
- from enum import Enum # noqa
-
-# -----------------------------------------------------------------------------
-# Globals and constants
-# -----------------------------------------------------------------------------
-__all__ = dir(six)
-
-
-# -----------------------------------------------------------------------------
-# Library functions
-# -----------------------------------------------------------------------------
-if sys.version_info[0:2] < (3, 2):
- setswitchinterval = sys.setcheckinterval
-else:
- setswitchinterval = sys.setswitchinterval
-
-if sys.version_info[0:2] < (3, 5):
- # getfullargspec deprecated up until python 3.5, so use getargspec
- getfullargspec = inspect.getargspec
-else:
- getfullargspec = inspect.getfullargspec
-
-
-# -----------------------------------------------------------------------------
-# File manipulation
-# -----------------------------------------------------------------------------
-csv_open_type = 'w'
-
-
-# -----------------------------------------------------------------------------
-# Strings
-# -----------------------------------------------------------------------------
-if not hasattr(six, "ensure_str"):
- # Ubuntu 16.04, Windows, and OSX Mantid builds have a version of six which
- # doesn't include ensure_str
- # ensure_str was added in six 1.12.0
- def ensure_str(s, encoding='utf-8', errors='strict'):
- """Coerce *s* to `str`.
- For Python 2:
- - `unicode` -> encoded to `str`
- - `str` -> `str`
- For Python 3:
- - `str` -> `str`
- - `bytes` -> decoded to `str`
- """
- if not isinstance(s, (text_type, binary_type)):
- raise TypeError("not expecting type '%s'" % type(s))
- if isinstance(s, text_type):
- s = s.encode(encoding, errors)
- elif isinstance(s, binary_type):
- s = s.decode(encoding, errors)
- return s
-
-
-def is_text_string(obj):
- """Return True if `obj` is a text string, False if it is anything else,
- like binary data (Python 3) or QString (Python 2, PyQt API #1)"""
- return isinstance(obj, str)
-
-
-def to_text_string(obj, encoding=None):
- """Convert `obj` to (unicode) text string"""
-
- if encoding is None:
- return str(obj)
- elif isinstance(obj, str):
- # In case this function is not used properly, this could happen
- return obj
- else:
- return str(obj, encoding)
-
-
-def qbytearray_to_str(qba):
- """Convert QByteArray object to str in a way compatible with Python 2/3"""
- return str(bytes(qba.toHex().data()).decode())
--
GitLab
From 421dcb8df9df2a4f7e14bb16bddc6b6201e728bb Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 30 Mar 2020 12:29:05 +0100
Subject: [PATCH 37/37] RE #27722 Remove references to py3compat and remove
---
.../PythonInterface/mantid/py3compat/__init__.py | 8 --------
Framework/PythonInterface/mantid/py3compat/mock.py | 12 ------------
.../mantid/api/AnalysisDataServiceObserverTest.py | 2 +-
.../test/python/mantid/kernel/ConfigObserverTest.py | 2 +-
.../mantid/kernel/ConfigPropertyObserverTest.py | 2 +-
.../test/python/mantid/plots/UtilityTest.py | 2 +-
.../test/python/mantid/plots/compatabilityTest.py | 2 +-
.../test/python/mantid/plots/datafunctionsTest.py | 2 +-
.../test/python/mantid/plots/plots__init__Test.py | 2 +-
.../WorkflowAlgorithms/FindPeakAutomaticTest.py | 2 +-
.../WorkflowAlgorithms/FitGaussianPeaksTest.py | 2 +-
.../sans/SANSBeamCentreFinderTest.py | 2 +-
.../test/test_plotscriptgenerator.py | 2 +-
.../test/test_plotscriptgeneratoraxes.py | 2 +-
.../test/test_plotscriptgeneratorlines.py | 2 +-
.../test/test_plotscriptgeneratorutils.py | 2 +-
.../plotting/test/test_figureinteraction.py | 2 +-
.../workbench/plotting/test/test_figuremanager.py | 2 +-
.../workbench/plotting/test/test_figurewindow.py | 2 +-
.../plotting/test/test_globalfiguremanager.py | 2 +-
.../workbench/workbench/plugins/test/test_editor.py | 2 +-
.../workbench/plugins/test/test_exception_handler.py | 2 +-
.../workbench/plugins/test/test_workspacewidget.py | 2 +-
.../recoverygui/test/test_projectrecoverymodel.py | 2 +-
.../test/test_projectrecoverypresenter.py | 2 +-
.../test/test_projectrecoverywidgetview.py | 2 +-
.../recoverygui/test/test_recoveryfailureview.py | 2 +-
.../projectrecovery/test/test_projectrecovery.py | 2 +-
.../test/test_projectrecoveryloader.py | 2 +-
.../test/test_projectrecoverysaver.py | 2 +-
.../workbench/workbench/test/mainwindowtest.py | 2 +-
.../plotselector/test/test_plotselector_model.py | 2 +-
.../plotselector/test/test_plotselector_presenter.py | 2 +-
.../plotselector/test/test_plotselector_view.py | 2 +-
.../categories/test/test_categories_settings.py | 2 +-
.../settings/fitting/test/test_fitting_settings.py | 2 +-
.../settings/general/test/test_general_settings.py | 2 +-
.../settings/plots/test/test_plot_settings.py | 2 +-
.../widgets/settings/test/test_settings_presenter.py | 2 +-
.../widgets/settings/test/test_settings_view.py | 2 +-
.../dialogs/test/test_spectraselectiondialog.py | 2 +-
.../dialogs/test/test_spectraselectorutils.py | 2 +-
qt/python/mantidqt/plotting/test/test_functions.py | 2 +-
qt/python/mantidqt/plotting/test/test_tiledplots.py | 2 +-
qt/python/mantidqt/project/test/test_plotsloader.py | 2 +-
qt/python/mantidqt/project/test/test_project.py | 2 +-
.../mantidqt/project/test/test_projectloader.py | 2 +-
qt/python/mantidqt/project/test/test_projectsaver.py | 2 +-
.../mantidqt/project/test/test_workspacesaver.py | 2 +-
qt/python/mantidqt/utils/test/test_modal_tester.py | 2 +-
qt/python/mantidqt/utils/test/test_writetosignal.py | 2 +-
.../mantidqt/utils/testing/mocks/mock_mantid.py | 2 +-
.../testing/mocks/mock_matrixworkspacedisplay.py | 2 +-
.../mantidqt/utils/testing/mocks/mock_observing.py | 2 +-
.../mantidqt/utils/testing/mocks/mock_plotlib.py | 2 +-
qt/python/mantidqt/utils/testing/mocks/mock_qt.py | 2 +-
qt/python/mantidqt/utils/testing/strict_mock.py | 2 +-
.../widgets/algorithmselector/test/observer_test.py | 2 +-
.../algorithmselector/test/test_algorithmselector.py | 2 +-
.../tab_widget/test/test_codeeditor_tab_presenter.py | 2 +-
.../widgets/codeeditor/test/test_completion.py | 2 +-
.../widgets/codeeditor/test/test_execution.py | 2 +-
.../widgets/codeeditor/test/test_interpreter.py | 2 +-
.../codeeditor/test/test_multifileinterpreter.py | 2 +-
.../codeeditor/test/test_scriptcompatibility.py | 2 +-
.../test_embedded_find_replace_dialog_presenter.py | 2 +-
.../test/test_addfunctiondialogpresenter.py | 2 +-
.../widgets/observers/test/test_ads_observer.py | 2 +-
.../test/test_axestabwidgetpresenter.py | 2 +-
.../test/test_curvestabwidgetpresenter.py | 2 +-
.../test/test_imagestabwidgetpresenter.py | 2 +-
.../test/test_apply_all_properties.py | 2 +-
.../test/test_plotconfigdialogpresenter.py | 2 +-
.../samplelogs/test/test_samplelogs_presenter.py | 2 +-
.../sliceviewer/test/test_sliceviewer_presenter.py | 2 +-
.../mantidqt/widgets/test/test_fitpropertybrowser.py | 2 +-
.../mantidqt/widgets/test/test_functionbrowser.py | 2 +-
.../test_waterfallplotfillareadialogpresenter.py | 2 +-
.../test/test_waterfallplotoffsetdialogpresenter.py | 2 +-
.../matrix/test/test_matrixworkspacedisplay_model.py | 2 +-
.../test/test_matrixworkspacedisplay_presenter.py | 2 +-
.../test_matrixworkspacedisplay_table_view_model.py | 2 +-
.../table/test/test_tableworkspacedisplay_model.py | 2 +-
.../test/test_tableworkspacedisplay_presenter.py | 2 +-
.../workspacedisplay/test/test_data_copier.py | 2 +-
.../workspacedisplay/test/test_user_notifier.py | 2 +-
.../settings/test/test_settings_model.py | 2 +-
.../settings/test/test_settings_presenter.py | 2 +-
.../tabs/calibration/test/test_calib_model.py | 4 ++--
.../tabs/calibration/test/test_calib_presenter.py | 4 ++--
.../common/cropping/test/test_cropping_presenter.py | 2 +-
.../tabs/common/test/test_vanadium_corrections.py | 2 +-
.../fitting/data_handling/test/test_data_model.py | 4 ++--
.../data_handling/test/test_data_presenter.py | 4 ++--
.../tabs/fitting/plotting/test/test_plot_model.py | 2 +-
.../fitting/plotting/test/test_plot_presenter.py | 2 +-
.../tabs/focus/test/test_focus_model.py | 2 +-
.../tabs/focus/test/test_focus_presenter.py | 4 ++--
.../Muon/GUI/Common/test_helpers/context_setup.py | 2 +-
scripts/SANS/sans/test_helper/mock_objects.py | 2 +-
scripts/test/CrystalFieldTest.py | 2 +-
scripts/test/ErrorReportPresenterTest.py | 2 +-
.../MultiPlotting/AxisChangerTwoPresenter_test.py | 2 +-
.../test/MultiPlotting/AxisChangerTwoView_test.py | 2 +-
scripts/test/MultiPlotting/MultiPlotWidget_test.py | 2 +-
.../test/MultiPlotting/MultiPlottingContext_test.py | 2 +-
.../test/MultiPlotting/QuickEditPresenter_test.py | 2 +-
scripts/test/MultiPlotting/QuickEditWidget_test.py | 2 +-
scripts/test/MultiPlotting/SubPlotContext_test.py | 2 +-
.../test/MultiPlotting/SubplotADSObserver_test.py | 2 +-
scripts/test/MultiPlotting/Subplot_test.py | 2 +-
scripts/test/Muon/FFTModel_test.py | 2 +-
scripts/test/Muon/FFTPresenter_test.py | 2 +-
scripts/test/Muon/LoadWidgetPresenter_test.py | 2 +-
scripts/test/Muon/LoadWidgetView_test.py | 2 +-
scripts/test/Muon/MaxEntModel_test.py | 2 +-
scripts/test/Muon/MaxEntPresenter_test.py | 2 +-
scripts/test/Muon/PlottingView_test.py | 2 +-
.../elemental_analysis/PeriodicTableModel_test.py | 2 +-
.../PeriodicTablePresenter_test.py | 2 +-
.../elemental_analysis/detectors_presenter_test.py | 2 +-
.../Muon/elemental_analysis/element_button_test.py | 2 +-
.../elemental_analysis/elemental_analysis_test.py | 2 +-
scripts/test/Muon/elemental_analysis/lmodel_test.py | 2 +-
.../test/Muon/elemental_analysis/load_model_test.py | 2 +-
.../test/Muon/elemental_analysis/load_utils_test.py | 2 +-
.../elemental_analysis/peak_selector_view_test.py | 2 +-
.../Muon/elemental_analysis/periodic_combo_test.py | 2 +-
.../Muon/elemental_analysis/periodic_list_test.py | 2 +-
.../elemental_analysis/periodic_table_item_test.py | 2 +-
.../Muon/elemental_analysis/periodic_table_test.py | 2 +-
.../Muon/fft_presenter_context_interaction_test.py | 2 +-
scripts/test/Muon/fit_information_test.py | 2 +-
scripts/test/Muon/fit_parameters_test.py | 2 +-
scripts/test/Muon/fitting_context_test.py | 2 +-
.../fitting_tab_widget/fitting_tab_model_test.py | 2 +-
.../fitting_tab_widget/fitting_tab_presenter_test.py | 2 +-
.../workspace_selector_dialog_presenter_test.py | 2 +-
scripts/test/Muon/frequency_domain_context_test.py | 2 +-
.../Muon/grouping_tab/grouping_tab_presenter_test.py | 2 +-
.../grouping_tab/grouping_table_presenter_test.py | 2 +-
.../Muon/grouping_tab/pairing_table_alpha_test.py | 2 +-
.../pairing_table_group_selector_test.py | 2 +-
.../grouping_tab/pairing_table_presenter_test.py | 2 +-
scripts/test/Muon/help_widget_presenter_test.py | 2 +-
scripts/test/Muon/home_instrument_widget_test.py | 2 +-
scripts/test/Muon/home_runinfo_presenter_test.py | 2 +-
.../list_selector/list_selector_presenter_test.py | 2 +-
.../loadfile_presenter_multiple_file_test.py | 2 +-
.../loadfile_presenter_single_file_test.py | 2 +-
.../test/Muon/load_run_widget/loadrun_model_test.py | 2 +-
.../loadrun_presenter_current_run_test.py | 4 ++--
.../loadrun_presenter_increment_decrement_test.py | 2 +-
.../loadrun_presenter_multiple_file_test.py | 2 +-
.../loadrun_presenter_single_file_test.py | 2 +-
.../loading_tab/loadwidget_presenter_failure_test.py | 2 +-
.../loadwidget_presenter_multiple_file_test.py | 2 +-
.../Muon/loading_tab/loadwidget_presenter_test.py | 2 +-
.../Muon/max_ent_presenter_load_interaction_test.py | 2 +-
.../test/Muon/muon_context_with_frequency_test.py | 2 +-
scripts/test/Muon/muon_data_context_test.py | 2 +-
scripts/test/Muon/muon_group_pair_context_test.py | 2 +-
scripts/test/Muon/muon_gui_context_test.py | 2 +-
.../phase_table_widget/phase_table_presenter_test.py | 2 +-
scripts/test/Muon/plotting_widget_freq_test.py | 2 +-
scripts/test/Muon/plotting_widget_model_test.py | 4 ++--
scripts/test/Muon/plotting_widget_test.py | 2 +-
scripts/test/Muon/plotting_widget_tiled_test.py | 2 +-
.../results_tab_widget/results_tab_model_test.py | 2 +-
.../results_tab_widget/results_tab_presenter_test.py | 2 +-
.../seq_fitting_tab_presenter_test.py | 2 +-
scripts/test/Muon/transformWidget_test.py | 2 +-
scripts/test/Muon/transform_widget_new_test.py | 2 +-
scripts/test/Muon/utilities/load_utils_test.py | 2 +-
scripts/test/Muon/utilities/muon_file_utils_test.py | 2 +-
scripts/test/Muon/utilities/muon_load_data_test.py | 2 +-
scripts/test/Muon/utilities/thread_model_test.py | 2 +-
scripts/test/Muon/workspace_finder_test.py | 2 +-
.../SANS/algorithm_detail/batch_execution_test.py | 2 +-
.../SANS/algorithm_detail/centre_finder_new_test.py | 2 +-
.../command_interface/batch_csv_file_parser_test.py | 2 +-
.../command_interface/isis_command_interface_test.py | 2 +-
scripts/test/SANS/common/file_information_test.py | 2 +-
scripts/test/SANS/common/general_functions_test.py | 2 +-
.../test/SANS/gui_logic/add_runs_presenter_test.py | 2 +-
.../test/SANS/gui_logic/batch_process_runner_test.py | 2 +-
.../test/SANS/gui_logic/beam_centre_model_test.py | 2 +-
.../SANS/gui_logic/beam_centre_presenter_test.py | 2 +-
scripts/test/SANS/gui_logic/create_state_test.py | 2 +-
.../gui_logic/diagnostics_page_presenter_test.py | 2 +-
scripts/test/SANS/gui_logic/gui_common_test.py | 2 +-
.../SANS/gui_logic/masking_table_presenter_test.py | 2 +-
.../presenter_tests/presenter_common_test.py | 2 +-
.../settings_adjustment_presenter_test.py | 2 +-
.../SANS/gui_logic/run_selector_presenter_test.py | 2 +-
.../test/SANS/gui_logic/run_tab_presenter_test.py | 2 +-
.../test/SANS/gui_logic/save_other_presenter_test.py | 2 +-
.../gui_logic/settings_diagnostic_presenter_test.py | 2 +-
.../gui_logic/summation_settings_presenter_test.py | 2 +-
scripts/test/SANS/state/StateBuilderTest.py | 2 +-
scripts/test/SANS/state/StateRunDataBuilderTest.py | 2 +-
scripts/test/TOFTOF/TOFTOFGUITest.py | 2 +-
202 files changed, 207 insertions(+), 227 deletions(-)
delete mode 100644 Framework/PythonInterface/mantid/py3compat/__init__.py
delete mode 100644 Framework/PythonInterface/mantid/py3compat/mock.py
diff --git a/Framework/PythonInterface/mantid/py3compat/__init__.py b/Framework/PythonInterface/mantid/py3compat/__init__.py
deleted file mode 100644
index c599abab0b8..00000000000
--- a/Framework/PythonInterface/mantid/py3compat/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Mantid Repository : https://github.com/mantidproject/mantid
-#
-# Copyright © 2018 ISIS Rutherford Appleton Laboratory UKRI,
-# NScD Oak Ridge National Laboratory, European Spallation Source,
-# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
-# SPDX - License - Identifier: GPL - 3.0 +
-# This file is part of the mantid workbench.
-#
diff --git a/Framework/PythonInterface/mantid/py3compat/mock.py b/Framework/PythonInterface/mantid/py3compat/mock.py
deleted file mode 100644
index 99bc501721f..00000000000
--- a/Framework/PythonInterface/mantid/py3compat/mock.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Mantid Repository : https://github.com/mantidproject/mantid
-#
-# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
-# NScD Oak Ridge National Laboratory, European Spallation Source,
-# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
-# SPDX - License - Identifier: GPL - 3.0 +
-try:
- # import for python 2 and python 3 with mock package installed
- from mock import * # noqa
-except ImportError:
- # Mock is within unittest.mock with Python 3
- from unittest.mock import * # noqa
diff --git a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
index ad42cd82cc5..30a151f1892 100644
--- a/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/api/AnalysisDataServiceObserverTest.py
@@ -10,7 +10,7 @@ import unittest
from mantid.api import AnalysisDataService as ADS, AnalysisDataServiceObserver
from mantid.simpleapi import CreateSampleWorkspace, RenameWorkspace, GroupWorkspaces, UnGroupWorkspace, DeleteWorkspace
-from mantid.py3compat import mock
+from unittest import mock
class FakeADSObserver(AnalysisDataServiceObserver):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
index 9b966b335f1..8244e002766 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigObserverTest.py
@@ -7,7 +7,7 @@
import unittest
from mantid.kernel import ConfigService, ConfigObserver
-from mantid.py3compat import mock
+from unittest import mock
class ConfigObserverTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
index 809f334830a..105cb78b4f3 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigPropertyObserverTest.py
@@ -7,7 +7,7 @@
import unittest
from mantid.kernel import ConfigService, ConfigPropertyObserver
-from mantid.py3compat import mock
+from unittest import mock
class ConfigObserverTest(unittest.TestCase):
diff --git a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
index e300846f0f4..21b6a88fd6b 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/UtilityTest.py
@@ -14,7 +14,7 @@
import unittest
from mantid.plots.utility import legend_set_draggable
-from mantid.py3compat.mock import create_autospec
+from unittest.mock import create_autospec
from matplotlib.legend import Legend
diff --git a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
index 2473d2ae351..95e932e0283 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/compatabilityTest.py
@@ -17,7 +17,7 @@ matplotlib.use('AGG') # noqa
# local imports
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantid.plots._compatability import plotSpectrum, plotBin
from mantid.plots.utility import MantidAxType
diff --git a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
index 6ff6108c5cd..45a5e6638d6 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/datafunctionsTest.py
@@ -15,7 +15,7 @@ import numpy as np
import mantid.api
import mantid.plots.datafunctions as funcs
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.kernel import config
from mantid.plots.utility import MantidAxType
from mantid.simpleapi import (AddSampleLog, AddTimeSeriesLog, ConjoinWorkspaces,
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
index 139b6f18346..40984aeab89 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
@@ -18,7 +18,7 @@ from mantid.plots import datafunctions
from mantid.plots.legend import convert_color_to_hex
from mantid.plots.utility import MantidAxType
from mantid.plots.axesfunctions import get_colorplot_extents
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import (CreateWorkspace, CreateSampleWorkspace, DeleteWorkspace,
RemoveSpectra, AnalysisDataService as ADS)
from mantidqt.plotting.markers import SingleMarker
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
index 632f183057f..995bf076987 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FindPeakAutomaticTest.py
@@ -9,7 +9,7 @@ import numpy as np
from mantid.simpleapi import CreateEmptyTableWorkspace, CreateWorkspace, DeleteWorkspace, FindPeaksAutomatic
from mantid.api import mtd
-from mantid.py3compat import mock
+from unittest import mock
import plugins.algorithms.WorkflowAlgorithms.FindPeaksAutomatic as _FindPeaksAutomatic
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
index 9d571e341a9..bc470068346 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/FitGaussianPeaksTest.py
@@ -9,7 +9,7 @@ import unittest
from mantid.simpleapi import CreateEmptyTableWorkspace, CreateWorkspace, DeleteWorkspace, FitGaussianPeaks
from mantid.api import *
-from mantid.py3compat import mock
+from unittest import mock
import plugins.algorithms.WorkflowAlgorithms.FitGaussianPeaks as _FitGaussianPeaks
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
index faa755c4ec0..d57d5e4fc18 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSBeamCentreFinderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from plugins.algorithms.WorkflowAlgorithms.SANS.SANSBeamCentreFinder import SANSBeamCentreFinder, _ResidualsDetails
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
index 8978bd89588..d9b298aef94 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgenerator.py
@@ -14,7 +14,7 @@ from matplotlib.axes import Axes
from matplotlib.legend import Legend
from mantid.plots import MantidAxes
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from workbench.plotting.plotscriptgenerator import generate_script
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
index f40b1832920..f844f5c3762 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratoraxes.py
@@ -12,7 +12,7 @@ import matplotlib as mpl
mpl.use('Agg') # noqa
import matplotlib.pyplot as plt
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from workbench.plotting.plotscriptgenerator.axes import (generate_axis_limit_commands,
generate_axis_label_commands)
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
index 3dfbe5bf4f3..5353e6b143c 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorlines.py
@@ -14,7 +14,7 @@ import matplotlib.pyplot as plt
from copy import copy
from matplotlib.container import ErrorbarContainer
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from workbench.plotting.plotscriptgenerator.lines import (_get_plot_command_kwargs_from_line2d,
_get_errorbar_specific_plot_kwargs,
diff --git a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
index 6416f144dca..96f51807c17 100644
--- a/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
+++ b/qt/applications/workbench/workbench/plotting/plotscriptgenerator/test/test_plotscriptgeneratorutils.py
@@ -12,7 +12,7 @@ from ast import parse
from collections import OrderedDict
from numpy import array
-from mantid.py3compat.mock import patch, Mock
+from unittest.mock import patch, Mock
from workbench.plotting.plotscriptgenerator.utils import (convert_args_to_string,
get_plotted_workspaces_names,
clean_variable_name,
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
index 5879ba13855..f8e8b7b19ca 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figureinteraction.py
@@ -23,7 +23,7 @@ from testhelpers import assert_almost_equal
# local package imports
from mantid.plots import MantidAxes
-from mantid.py3compat.mock import MagicMock, PropertyMock, call, patch
+from unittest.mock import MagicMock, PropertyMock, call, patch
from mantid.simpleapi import CreateWorkspace
from mantidqt.plotting.figuretype import FigureType
from mantidqt.plotting.functions import plot
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py b/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
index 2866b3ddd01..a4ef45de703 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figuremanager.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench.
import unittest
-from mantid.py3compat.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plotting.figuremanager import FigureCanvasQTAgg, FigureManagerWorkbench
diff --git a/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py b/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
index 99a46a4a016..b112c68cf89 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_figurewindow.py
@@ -13,7 +13,7 @@ matplotlib.use('Qt5Agg') # noqa # we need Qt for events to work
import matplotlib.pyplot as plt
from mantid import plots # noqa # register mantid projection
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantid.simpleapi import CreateWorkspace
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plotting.figurewindow import FigureWindow
diff --git a/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
index 25782ac4ff5..a0ec1c6d751 100644
--- a/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
+++ b/qt/applications/workbench/workbench/plotting/test/test_globalfiguremanager.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
from workbench.plotting.globalfiguremanager import FigureAction, GlobalFigureManager, GlobalFigureManagerObserver
from workbench.plotting.observabledictionary import DictionaryAction
diff --git a/qt/applications/workbench/workbench/plugins/test/test_editor.py b/qt/applications/workbench/workbench/plugins/test/test_editor.py
index 39136a392cb..6b10feff66a 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_editor.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_editor.py
@@ -11,7 +11,7 @@ import os
from qtpy.QtWidgets import QMainWindow
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.plugins.editor import MultiFileEditor
diff --git a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
index 1f8a15d4e32..b8df7a21d1d 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_exception_handler.py
@@ -7,7 +7,7 @@
import unittest
from mantid import UsageService
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from workbench.plugins.exception_handler import exception_logger
diff --git a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
index 3d38d8daa0d..800394274f8 100644
--- a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
+++ b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py
@@ -12,7 +12,7 @@ import unittest
import matplotlib as mpl
mpl.use('Agg') # noqa
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import (CreateEmptyTableWorkspace, CreateSampleWorkspace,
GroupWorkspaces)
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
index 04276a3e7b1..713ef87a77a 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverymodel.py
@@ -15,7 +15,7 @@ import unittest
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
from mantid.simpleapi import CreateSampleWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery, NO_OF_CHECKPOINTS_KEY
from workbench.projectrecovery.recoverygui.projectrecoverymodel import ProjectRecoveryModel
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
index 92bbb33ff4f..d1870cf8f33 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverypresenter.py
@@ -9,7 +9,7 @@
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.recoverygui.projectrecoverypresenter import ProjectRecoveryPresenter
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
index c5dfa29dc71..6c5f8b035c4 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_projectrecoverywidgetview.py
@@ -9,7 +9,7 @@
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.projectrecovery.recoverygui.projectrecoverywidgetview import ProjectRecoveryWidgetView
diff --git a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
index c4ac4778256..2f443db90b9 100644
--- a/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
+++ b/qt/applications/workbench/workbench/projectrecovery/recoverygui/test/test_recoveryfailureview.py
@@ -11,7 +11,7 @@ import unittest
from qtpy.QtWidgets import QTableWidgetItem
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.projectrecovery.recoverygui.recoveryfailureview import RecoveryFailureView
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
index 06f81050991..eb5d56e0c07 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
@@ -18,7 +18,7 @@ import datetime
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery, SAVING_TIME_KEY, NO_OF_CHECKPOINTS_KEY, \
RECOVERY_ENABLED_KEY
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
index 19d69dacd5d..5c964f38073 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoveryloader.py
@@ -14,7 +14,7 @@ import tempfile
import unittest
from mantid.api import AnalysisDataService as ADS
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateSampleWorkspace
from mantidqt.utils.testing.strict_mock import StrictContextManagerMock
diff --git a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
index 6621e7891c2..1f3ecd7ddb7 100644
--- a/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
+++ b/qt/applications/workbench/workbench/projectrecovery/test/test_projectrecoverysaver.py
@@ -16,7 +16,7 @@ import unittest
from mantid.api import AnalysisDataService as ADS
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces
-from mantid.py3compat import mock
+from unittest import mock
from workbench.projectrecovery.projectrecovery import ProjectRecovery
if sys.version_info.major >= 3:
diff --git a/qt/applications/workbench/workbench/test/mainwindowtest.py b/qt/applications/workbench/workbench/test/mainwindowtest.py
index ba6727b4882..5373ee24bbe 100644
--- a/qt/applications/workbench/workbench/test/mainwindowtest.py
+++ b/qt/applications/workbench/workbench/test/mainwindowtest.py
@@ -12,7 +12,7 @@ Defines the QMainWindow of the application and the main() entry point.
"""
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from workbench.app.mainwindow import MainWindow
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
index 850411c0889..781ba002958 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_model.py
@@ -9,7 +9,7 @@
#
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.plotting.globalfiguremanager import FigureAction
from workbench.widgets.plotselector.model import PlotSelectorModel
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
index f2250c64da7..1615401b2e6 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_presenter.py
@@ -10,7 +10,7 @@
import os
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from workbench.widgets.plotselector.model import PlotSelectorModel
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
from workbench.widgets.plotselector.view import PlotSelectorView, Column
diff --git a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
index f24726cf95d..acf545aa5d2 100644
--- a/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
+++ b/qt/applications/workbench/workbench/widgets/plotselector/test/test_plotselector_view.py
@@ -12,7 +12,7 @@ from qtpy.QtGui import QIcon
from qtpy.QtTest import QTest
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from workbench.widgets.plotselector.presenter import PlotSelectorPresenter
from workbench.widgets.plotselector.view import EXPORT_TYPES, PlotSelectorView, Column
diff --git a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
index 4466e836cd5..ce3021ee42b 100644
--- a/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/categories/test/test_categories_settings.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench
import unittest
-from mantid.py3compat.mock import call, Mock, patch, ANY
+from unittest.mock import call, Mock, patch, ANY
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from mantidqt.utils.testing.strict_mock import StrictMock
diff --git a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
index e6b9a23bcbf..3e17e10da48 100644
--- a/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/fitting/test/test_fitting_settings.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench
import unittest
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.fitting.presenter import FittingSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
index 7ea961abbb8..4836ef1318f 100644
--- a/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/general/test/test_general_settings.py
@@ -8,7 +8,7 @@
import unittest
import sys
-from mantid.py3compat.mock import call, patch, MagicMock, Mock
+from unittest.mock import call, patch, MagicMock, Mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.general.presenter import GeneralSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
index e1e38891dd2..27e9deb552a 100644
--- a/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
+++ b/qt/applications/workbench/workbench/widgets/settings/plots/test/test_plot_settings.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench
import unittest
-from mantid.py3compat.mock import call, patch
+from unittest.mock import call, patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.testing.strict_mock import StrictMock
from workbench.widgets.settings.plots.presenter import PlotSettings
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
index 76f9bd30c50..967317b8792 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_presenter.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench
from unittest import TestCase
-from mantid.py3compat.mock import call, Mock
+from unittest.mock import call, Mock
from mantidqt.utils.testing.mocks.mock_qt import MockQButton, MockQWidget
from mantidqt.utils.testing.strict_mock import StrictPropertyMock
from workbench.widgets.settings.presenter import SettingsPresenter
diff --git a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
index bc21c677988..ffa1244fccc 100644
--- a/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
+++ b/qt/applications/workbench/workbench/widgets/settings/test/test_settings_view.py
@@ -9,7 +9,7 @@ import unittest
from qtpy.QtWidgets import QApplication, QWidget
-from mantid.py3compat.mock import MagicMock
+from unittest.mock import MagicMock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.qt.testing.qt_widget_finder import QtWidgetFinder
from workbench.widgets.settings.presenter import SettingsPresenter
diff --git a/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py b/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
index e4a125f39fd..b42fac458c2 100644
--- a/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
+++ b/qt/python/mantidqt/dialogs/test/test_spectraselectiondialog.py
@@ -10,7 +10,7 @@ from qtpy.QtGui import QIcon
from qtpy.QtWidgets import QDialogButtonBox
from mantid.api import WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import ExtractSpectra
from mantidqt.dialogs import spectraselectordialog
from mantidqt.dialogs.spectraselectordialog import parse_selection_str, SpectraSelectionDialog
diff --git a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
index 60f69d96666..37a00369405 100644
--- a/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
+++ b/qt/python/mantidqt/dialogs/test/test_spectraselectorutils.py
@@ -8,7 +8,7 @@
import unittest
from mantid.api import WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import ExtractSpectra
from mantidqt.dialogs.spectraselectorutils import get_spectra_selection
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/plotting/test/test_functions.py b/qt/python/mantidqt/plotting/test/test_functions.py
index b31e166051d..0901fa0a231 100644
--- a/qt/python/mantidqt/plotting/test/test_functions.py
+++ b/qt/python/mantidqt/plotting/test/test_functions.py
@@ -23,7 +23,7 @@ import mantid.plots # noqa
from mantid.api import AnalysisDataService, WorkspaceFactory
from mantid.kernel import config
from mantid.plots import MantidAxes
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.dialogs.spectraselectordialog import SpectraSelection
from mantidqt.plotting.functions import (can_overplot, current_figure_or_none, figure_title,
manage_workspace_names, plot, plot_from_names,
diff --git a/qt/python/mantidqt/plotting/test/test_tiledplots.py b/qt/python/mantidqt/plotting/test/test_tiledplots.py
index 89a874301d2..21c68ca124a 100644
--- a/qt/python/mantidqt/plotting/test/test_tiledplots.py
+++ b/qt/python/mantidqt/plotting/test/test_tiledplots.py
@@ -20,7 +20,7 @@ from matplotlib import _pylab_helpers
# register mantid projection
import mantid.plots # noqa
from mantid.api import AnalysisDataService, WorkspaceFactory
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.dialogs.spectraselectordialog import SpectraSelection
from mantid.plots.plotfunctions import manage_workspace_names, get_plot_fig
from mantidqt.plotting.functions import plot_from_names
diff --git a/qt/python/mantidqt/project/test/test_plotsloader.py b/qt/python/mantidqt/project/test/test_plotsloader.py
index f36c8af49c0..b0cf4ca42fb 100644
--- a/qt/python/mantidqt/project/test/test_plotsloader.py
+++ b/qt/python/mantidqt/project/test/test_plotsloader.py
@@ -18,7 +18,7 @@ from mantidqt.project.plotsloader import PlotsLoader # noqa
import mantid.plots.axesfunctions # noqa
from mantid.api import AnalysisDataService as ADS # noqa
from mantid.dataobjects import Workspace2D # noqa
-from mantid.py3compat import mock # noqa
+from unittest import mock # noqa
def pass_func():
diff --git a/qt/python/mantidqt/project/test/test_project.py b/qt/python/mantidqt/project/test/test_project.py
index e0d8e56f338..038f2230905 100644
--- a/qt/python/mantidqt/project/test/test_project.py
+++ b/qt/python/mantidqt/project/test/test_project.py
@@ -17,7 +17,7 @@ from qtpy.QtWidgets import QMessageBox
from mantid.api import AnalysisDataService as ADS
from mantid.kernel import ConfigService
from mantid.simpleapi import CreateSampleWorkspace, GroupWorkspaces, RenameWorkspace, UnGroupWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.project.project import Project
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/project/test/test_projectloader.py b/qt/python/mantidqt/project/test/test_projectloader.py
index 1870ad4ede0..7517e369151 100644
--- a/qt/python/mantidqt/project/test/test_projectloader.py
+++ b/qt/python/mantidqt/project/test/test_projectloader.py
@@ -20,7 +20,7 @@ import tempfile # noqa
from mantid.api import AnalysisDataService as ADS # noqa
from mantid.simpleapi import CreateSampleWorkspace # noqa
-from mantid.py3compat import mock # noqa
+from unittest import mock # noqa
from mantidqt.project import projectloader, projectsaver # noqa
from mantidqt.utils.qt.testing import start_qapplication # noqa
diff --git a/qt/python/mantidqt/project/test/test_projectsaver.py b/qt/python/mantidqt/project/test/test_projectsaver.py
index 40e7725c5bb..30292a2d11c 100644
--- a/qt/python/mantidqt/project/test/test_projectsaver.py
+++ b/qt/python/mantidqt/project/test/test_projectsaver.py
@@ -16,7 +16,7 @@ from shutil import rmtree
from mantid.api import AnalysisDataService as ADS
from mantid.simpleapi import CreateSampleWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.project import projectsaver
diff --git a/qt/python/mantidqt/project/test/test_workspacesaver.py b/qt/python/mantidqt/project/test/test_workspacesaver.py
index bc4fde63330..fe18900e2ad 100644
--- a/qt/python/mantidqt/project/test/test_workspacesaver.py
+++ b/qt/python/mantidqt/project/test/test_workspacesaver.py
@@ -17,7 +17,7 @@ import tempfile
from mantid.api import AnalysisDataService as ADS, IMDEventWorkspace # noqa
from mantid.dataobjects import MDHistoWorkspace, MaskWorkspace # noqa
from mantidqt.project import workspacesaver
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import (CreateSampleWorkspace, CreateMDHistoWorkspace, LoadMD, LoadMask, MaskDetectors, # noqa
ExtractMask, GroupWorkspaces) # noqa
diff --git a/qt/python/mantidqt/utils/test/test_modal_tester.py b/qt/python/mantidqt/utils/test/test_modal_tester.py
index f34ed65902a..18981949c94 100644
--- a/qt/python/mantidqt/utils/test/test_modal_tester.py
+++ b/qt/python/mantidqt/utils/test/test_modal_tester.py
@@ -12,7 +12,7 @@
import unittest
from qtpy.QtWidgets import QInputDialog
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication, ModalTester
diff --git a/qt/python/mantidqt/utils/test/test_writetosignal.py b/qt/python/mantidqt/utils/test/test_writetosignal.py
index 7e7096ca3ce..051aedf89d8 100644
--- a/qt/python/mantidqt/utils/test/test_writetosignal.py
+++ b/qt/python/mantidqt/utils/test/test_writetosignal.py
@@ -10,7 +10,7 @@
from qtpy.QtCore import QCoreApplication, QObject
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.writetosignal import WriteToSignal
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
index b3e8d51e860..9a37f8549b0 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_mantid.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
AXIS_INDEX_FOR_HORIZONTAL = 0
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
index 1ae255eea78..35e53f3282a 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_matrixworkspacedisplay.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.mocks.mock_qt import MockQTab, MockQTableView
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
index 224fabe3673..3fb6ca81a86 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_observing.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.observers.observing_presenter import ObservingPresenter
from mantidqt.widgets.observers.observing_view import ObservingView
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
index 1a7035eba18..0025d34f9de 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_plotlib.py
@@ -23,7 +23,7 @@ only the ones that have been necessary so far. If another function
needs to be mocked it can be freely added in the relevant class below
and it should not break any existing tests.
"""
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
class MockAx:
diff --git a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
index ed3ac79eed3..6de077c1647 100644
--- a/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
+++ b/qt/python/mantidqt/utils/testing/mocks/mock_qt.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
# This file is part of the mantid workbench.
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.strict_mock import StrictMock
try:
diff --git a/qt/python/mantidqt/utils/testing/strict_mock.py b/qt/python/mantidqt/utils/testing/strict_mock.py
index 722040aff08..d6f6a9ee6b8 100644
--- a/qt/python/mantidqt/utils/testing/strict_mock.py
+++ b/qt/python/mantidqt/utils/testing/strict_mock.py
@@ -7,7 +7,7 @@
# This file is part of the mantidqt package
import unittest
-from mantid.py3compat.mock import Mock, PropertyMock
+from unittest.mock import Mock, PropertyMock
class StrictMock(Mock):
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
index 987b823bf66..b65be5c4370 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/observer_test.py
@@ -10,7 +10,7 @@
import unittest
from mantid.api import AlgorithmFactory, PythonAlgorithm
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.algorithmselector.widget import AlgorithmSelectorWidget
from mantidqt.widgets.algorithmselector.algorithm_factory_observer import AlgorithmSelectorFactoryObserver
diff --git a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
index d4fb43293aa..a0be969cd8c 100644
--- a/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
+++ b/qt/python/mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
@@ -15,7 +15,7 @@ from qtpy.QtCore import Qt
from qtpy.QtTest import QTest
from mantid.api import AlgorithmFactoryImpl
-from mantid.py3compat.mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
from mantidqt.utils.qt.testing import (select_item_in_combo_box,
select_item_in_tree, start_qapplication)
from mantidqt.widgets.algorithmselector.model import AlgorithmSelectorModel
diff --git a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
index 6d8a4859e85..b4ec7fbe3f3 100644
--- a/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
@@ -8,7 +8,7 @@
import os
from unittest import TestCase
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQWidget
from mantidqt.utils.testing.strict_mock import StrictPropertyMock
from mantidqt.widgets.codeeditor.tab_widget.codeeditor_tab_presenter import CodeEditorTabPresenter
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
index dfb83499d0a..edc7fc1a7d7 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_completion.py
@@ -12,7 +12,7 @@ import matplotlib.pyplot as plt # noqa
import numpy as np # noqa
from mantid.simpleapi import Rebin # noqa # needed so sys.modules can pick up Rebin
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.codeeditor.completion import (CodeCompleter, generate_call_tips, get_function_spec,
get_builtin_argspec, get_module_import_alias)
from testhelpers import assertRaisesNothing
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
index 2729d2d6f1b..660417454da 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_execution.py
@@ -18,7 +18,7 @@ from qtpy.QtCore import QCoreApplication, QObject
# local imports
from io import StringIO
-from mantid.py3compat.mock import patch, Mock
+from unittest.mock import patch, Mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.execution import PythonCodeExecution, _get_imported_from_future
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
index 1f8a2390ed7..35b83d55ebe 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_interpreter.py
@@ -9,7 +9,7 @@
#
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets.codeeditor.interpreter import PythonFileInterpreter
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
index 77d68dab0eb..e449aab996c 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
@@ -9,7 +9,7 @@
#
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.utils.qt.testing.qt_widget_finder import QtWidgetFinder
from mantidqt.widgets.codeeditor.multifileinterpreter import MultiPythonFileInterpreter
diff --git a/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py b/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
index 3fa0ce52b3e..2c9321e49ac 100644
--- a/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
+++ b/qt/python/mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
@@ -10,7 +10,7 @@
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.codeeditor.scriptcompatibility import (mantid_api_import_needed,
mantid_algorithm_used_without_import)
diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
index 8ec6e174efa..206a263abe1 100644
--- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
+++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/test/test_embedded_find_replace_dialog_presenter.py
@@ -7,7 +7,7 @@
# This file is part of the mantidqt package
from unittest import TestCase
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.embedded_find_replace_dialog.presenter import EmbeddedFindReplaceDialog, SearchDirection
from mantidqt.utils.testing.mocks.mock_codeeditor import MockCodeEditor
diff --git a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
index 7d85ad05b81..3a4d7099c37 100644
--- a/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
+++ b/qt/python/mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
@@ -8,7 +8,7 @@
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.widgets.fitpropertybrowser.addfunctiondialog.presenter import AddFunctionDialog
from testhelpers import assertRaisesNothing
diff --git a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
index 60b69e8f4b7..923c6edb690 100644
--- a/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
+++ b/qt/python/mantidqt/widgets/observers/test/test_ads_observer.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench.
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.observers.ads_observer import WorkspaceDisplayADSObserver
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
index 370d464a71d..ed9b8188047 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/axestabwidget/test/test_axestabwidgetpresenter.py
@@ -12,7 +12,7 @@ from matplotlib import use as mpl_use
mpl_use('Agg') # noqa
from matplotlib.pyplot import figure
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.plotconfigdialog import generate_ax_name, get_axes_names_dict
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.axestabwidget.presenter import AxesTabWidgetPresenter as Presenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
index 906bc0e73b1..eedcd97191f 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/curvestabwidget/test/test_curvestabwidgetpresenter.py
@@ -17,7 +17,7 @@ from numpy import array_equal
from mantid.simpleapi import CreateWorkspace
from mantid.plots import datafunctions
from mantid.plots.utility import MantidAxType
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.colorselector import convert_color_to_hex
from mantidqt.widgets.plotconfigdialog.curvestabwidget import CurveProperties
from mantidqt.widgets.plotconfigdialog.curvestabwidget.presenter import (
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
index 4190ff43b05..2134a1acd5f 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/imagestabwidget/test/test_imagestabwidgetpresenter.py
@@ -15,7 +15,7 @@ from matplotlib.pyplot import figure
from numpy import linspace, random
from mantid.plots import MantidAxes # register mantid projection # noqa
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.simpleapi import CreateWorkspace
from mantidqt.widgets.plotconfigdialog.imagestabwidget import ImageProperties
from mantidqt.widgets.plotconfigdialog.imagestabwidget.presenter import ImagesTabWidgetPresenter
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
index 84eac3ac2e3..755f292774e 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_apply_all_properties.py
@@ -16,7 +16,7 @@ from matplotlib.patches import BoxStyle
from matplotlib.pyplot import figure
from mantid.plots.legend import LegendProperties
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.colorselector import convert_color_to_hex
from mantidqt.widgets.plotconfigdialog.axestabwidget import AxProperties
from mantidqt.widgets.plotconfigdialog.imagestabwidget import ImageProperties
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
index 434be721e0e..648a178c1c7 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/test/test_plotconfigdialogpresenter.py
@@ -12,7 +12,7 @@ from matplotlib import use as mpl_use
mpl_use('Agg') # noqa
from matplotlib.pyplot import figure
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.widgets.plotconfigdialog.presenter import PlotConfigDialogPresenter
diff --git a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
index c01ebf7c573..570d8ae0bfe 100644
--- a/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
+++ b/qt/python/mantidqt/widgets/samplelogs/test/test_samplelogs_presenter.py
@@ -11,7 +11,7 @@ import matplotlib
matplotlib.use('Agg') # noqa: E402
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.samplelogs.model import SampleLogsModel
from mantidqt.widgets.samplelogs.presenter import SampleLogs
from mantidqt.widgets.samplelogs.view import SampleLogsView
diff --git a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
index b299f86fd65..6398948e757 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
@@ -12,7 +12,7 @@ matplotlib.use('Agg') # noqa: E402
import unittest
import mantid.api
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.widgets.sliceviewer.model import SliceViewerModel, WS_TYPE
from mantidqt.widgets.sliceviewer.presenter import SliceViewer
from mantidqt.widgets.sliceviewer.view import SliceViewerView
diff --git a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
index a0cd07b36a6..99c611413fb 100644
--- a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
@@ -13,7 +13,7 @@ matplotlib.use('AGG') # noqa
from numpy import zeros
from mantid.api import AnalysisDataService, WorkspaceFactory
-from mantid.py3compat.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
from mantid.simpleapi import CreateSampleWorkspace, CreateWorkspace
from mantidqt.plotting.functions import plot
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/qt/python/mantidqt/widgets/test/test_functionbrowser.py b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
index 8d5b7a55164..7335afe66e0 100644
--- a/qt/python/mantidqt/widgets/test/test_functionbrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_functionbrowser.py
@@ -12,7 +12,7 @@ from qtpy.QtTest import QTest
from mantid import FrameworkManager, FunctionFactory
from mantid.fitfunctions import FunctionWrapper
-from mantid.py3compat.mock import MagicMock, call
+from unittest.mock import MagicMock, call
from mantidqt.utils.qt.testing.gui_window_test import (GuiWindowTest, not_on_windows, get_child, click_on)
from mantidqt.widgets.functionbrowser import FunctionBrowser
diff --git a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
index d250d8e6b76..586214700bc 100644
--- a/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
@@ -12,7 +12,7 @@ from matplotlib.collections import PolyCollection
from matplotlib.pyplot import figure
from mantid.plots import datafunctions
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.waterfallplotfillareadialog.presenter import WaterfallPlotFillAreaDialogPresenter
diff --git a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
index 145858cf5d1..a197b4cb9eb 100644
--- a/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
+++ b/qt/python/mantidqt/widgets/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
@@ -11,7 +11,7 @@ import unittest
from matplotlib.pyplot import figure
from mantid.plots import MantidAxes # noqa
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.widgets.waterfallplotoffsetdialog.presenter import WaterfallPlotOffsetDialogPresenter
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
index f6641acaf67..3fcd6106003 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_model.py
@@ -9,7 +9,7 @@
#
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantid.simpleapi import CreateSampleWorkspace
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.widgets.workspacedisplay.matrix.model import MatrixWorkspaceDisplayModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
index b422d72c792..7d17e1f2a7b 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_presenter.py
@@ -11,7 +11,7 @@ import unittest
from qtpy.QtWidgets import QStatusBar
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.mocks.mock_matrixworkspacedisplay import MockMatrixWorkspaceDisplayView
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex, MockQTableView
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
index dce81680162..ffd71c7b7b0 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/test/test_matrixworkspacedisplay_table_view_model.py
@@ -13,7 +13,7 @@ import qtpy
from qtpy import QtCore
from qtpy.QtCore import Qt
-from mantid.py3compat.mock import MagicMock, Mock, call
+from unittest.mock import MagicMock, Mock, call
from mantidqt.utils.testing.mocks.mock_mantid import AXIS_INDEX_FOR_HORIZONTAL, AXIS_INDEX_FOR_VERTICAL, MockMantidAxis, \
MockMantidSymbol, MockMantidUnit, MockSpectrum, MockWorkspace
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
index 814bce75866..a856738438b 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
@@ -11,7 +11,7 @@ import functools
import unittest
from mantid.kernel import V3D
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.strict_mock import StrictMock
from mantidqt.widgets.workspacedisplay.table.model import TableWorkspaceColumnTypeMapping, TableWorkspaceDisplayModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
index d9118f2e3d4..9e80be240af 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
@@ -11,7 +11,7 @@ import unittest
from qtpy.QtWidgets import QStatusBar
-from mantid.py3compat.mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
from mantidqt.utils.testing.mocks.mock_mantid import MockWorkspace
from mantidqt.utils.testing.mocks.mock_plotlib import MockAx, MockPlotLib
from mantidqt.utils.testing.mocks.mock_qt import MockQModelIndex, MockQSelectionModel
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py b/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
index b95ab45e14f..70b5d28264b 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/test/test_data_copier.py
@@ -7,7 +7,7 @@
# This file is part of the mantid workbench.
from unittest import TestCase
-from mantid.py3compat.mock import Mock, patch
+from unittest.mock import Mock, patch
from qtpy.QtWidgets import QMessageBox
from mantidqt.widgets.workspacedisplay.data_copier import DataCopier
diff --git a/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py b/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
index 4a2a244d43d..fc903200df9 100644
--- a/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
+++ b/qt/python/mantidqt/widgets/workspacedisplay/test/test_user_notifier.py
@@ -8,7 +8,7 @@
import sys
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from mantidqt.utils.testing.mocks.mock_qt import MockQStatusBar
from mantidqt.widgets.workspacedisplay.user_notifier import UserNotifier
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
index 5b7c47b11f4..17f7b77831d 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_model.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.settings.settings_model import SettingsModel
dir_path = "Engineering.gui.engineering_diffraction.settings."
diff --git a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
index 950c16aa2d2..03b3e977b07 100644
--- a/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/settings/test/test_settings_presenter.py
@@ -7,7 +7,7 @@
# pylint: disable=invalid-name
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.settings import settings_model, settings_view, settings_presenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
index 05a31800e29..1b15fdbc719 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import patch
-from mantid.py3compat.mock import MagicMock
+from unittest.mock import patch
+from unittest.mock import MagicMock
from Engineering.gui.engineering_diffraction.tabs.calibration.model import CalibrationModel
VANADIUM_NUMBER = "307521"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index 710f0019dbe..8719144e3d9 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import patch, MagicMock
-from mantid.py3compat import mock
+from unittest.mock import patch, MagicMock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.calibration import model, view, presenter
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
index 6fc52e4bfb0..dc49c3c48ce 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.common.cropping import cropping_model, cropping_view, cropping_presenter
dir_path = "Engineering.gui.engineering_diffraction.tabs.common.cropping"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
index 605580fb2fe..b27db29fcf9 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/test/test_vanadium_corrections.py
@@ -10,7 +10,7 @@ from shutil import rmtree
from os import path
from Engineering.gui.engineering_diffraction.tabs.common import vanadium_corrections
-from mantid.py3compat.mock import patch
+from unittest.mock import patch
dir_path = "Engineering.gui.engineering_diffraction.tabs.common"
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
index 1c42efc282f..3d177b0ac34 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_model.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.tabs.fitting.data_handling.data_model import FittingDataModel
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
index 4d0301cb2de..fe3e6af22a9 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Engineering.gui.engineering_diffraction.tabs.fitting.data_handling import data_model, data_presenter, data_view
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
index 812fcfa65e9..d05061a7b48 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_model.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.fitting.plotting import plot_model
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
index 293ae3859c8..3595a2bb52c 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/plotting/test/test_plot_presenter.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Engineering.gui.engineering_diffraction.tabs.fitting.plotting import plot_model, plot_view, plot_presenter
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
index 2b3803e6ae5..413857d2987 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py
@@ -9,7 +9,7 @@ import tempfile
import shutil
from os import path
-from mantid.py3compat.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
from mantid.simpleapi import CreateSampleWorkspace
from Engineering.gui.engineering_diffraction.tabs.focus import model
from Engineering.gui.engineering_diffraction.tabs.common import path_handling
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index 59f075397ea..6d74fefe505 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch, MagicMock
+from unittest import mock
+from unittest.mock import patch, MagicMock
from Engineering.gui.engineering_diffraction.tabs.focus import model, view, presenter
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
diff --git a/scripts/Muon/GUI/Common/test_helpers/context_setup.py b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
index 233eb2b8014..97b19930917 100644
--- a/scripts/Muon/GUI/Common/test_helpers/context_setup.py
+++ b/scripts/Muon/GUI/Common/test_helpers/context_setup.py
@@ -12,7 +12,7 @@ from Muon.GUI.Common.muon_load_data import MuonLoadData
from Muon.GUI.Common.contexts.phase_table_context import PhaseTableContext
from Muon.GUI.Common.contexts.fitting_context import FittingContext
from Muon.GUI.FrequencyDomainAnalysis.frequency_context import FrequencyContext
-from mantid.py3compat import mock
+from unittest import mock
def setup_context_for_tests(parent_object):
diff --git a/scripts/SANS/sans/test_helper/mock_objects.py b/scripts/SANS/sans/test_helper/mock_objects.py
index b67ac9a3502..54124d691af 100644
--- a/scripts/SANS/sans/test_helper/mock_objects.py
+++ b/scripts/SANS/sans/test_helper/mock_objects.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from functools import (partial)
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.run_tab_presenter import RunTabPresenter
from sans.common.enums import (RangeStepType, OutputMode, SANSFacility, SANSInstrument)
from sans.state.JsonSerializable import JsonSerializable
diff --git a/scripts/test/CrystalFieldTest.py b/scripts/test/CrystalFieldTest.py
index af5301c7993..da94610ecfc 100644
--- a/scripts/test/CrystalFieldTest.py
+++ b/scripts/test/CrystalFieldTest.py
@@ -1504,7 +1504,7 @@ class CrystalFieldFitTest(unittest.TestCase):
def test_CrystalField_PointCharge_file(self):
from CrystalField import PointCharge
import mantid.simpleapi
- from mantid.py3compat import mock
+ from unittest import mock
# Just check that LoadCIF is called... we'll rely on LoadCIF working properly!
with mock.patch.object(mantid.simpleapi, 'LoadCIF') as loadcif:
diff --git a/scripts/test/ErrorReportPresenterTest.py b/scripts/test/ErrorReportPresenterTest.py
index 1969e3fa8c1..b32a7b4eef9 100644
--- a/scripts/test/ErrorReportPresenterTest.py
+++ b/scripts/test/ErrorReportPresenterTest.py
@@ -7,7 +7,7 @@
import unittest
from ErrorReporter.error_report_presenter import ErrorReporterPresenter
-from mantid.py3compat import mock
+from unittest import mock
class ErrorReportPresenterTest(unittest.TestCase):
diff --git a/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py b/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
index b0802c7b5f8..d8f5d210e47 100644
--- a/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
+++ b/scripts/test/MultiPlotting/AxisChangerTwoPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.AxisChanger.axis_changer_presenter import AxisChangerPresenter
from MultiPlotting.AxisChanger.axis_changer_view import AxisChangerView
diff --git a/scripts/test/MultiPlotting/AxisChangerTwoView_test.py b/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
index e319bd74871..22230da406f 100644
--- a/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
+++ b/scripts/test/MultiPlotting/AxisChangerTwoView_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.AxisChanger.axis_changer_view import AxisChangerView
diff --git a/scripts/test/MultiPlotting/MultiPlotWidget_test.py b/scripts/test/MultiPlotting/MultiPlotWidget_test.py
index d9a394da579..12307c8b338 100644
--- a/scripts/test/MultiPlotting/MultiPlotWidget_test.py
+++ b/scripts/test/MultiPlotting/MultiPlotWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.multi_plotting_context import PlottingContext
diff --git a/scripts/test/MultiPlotting/MultiPlottingContext_test.py b/scripts/test/MultiPlotting/MultiPlottingContext_test.py
index 2ed8bd38abb..a671c19bc70 100644
--- a/scripts/test/MultiPlotting/MultiPlottingContext_test.py
+++ b/scripts/test/MultiPlotting/MultiPlottingContext_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.multi_plotting_context import PlottingContext
from MultiPlotting.subplot.subplot_context import subplotContext
from line_helper import line
diff --git a/scripts/test/MultiPlotting/QuickEditPresenter_test.py b/scripts/test/MultiPlotting/QuickEditPresenter_test.py
index 249b9ea91dc..95cfa4449ee 100644
--- a/scripts/test/MultiPlotting/QuickEditPresenter_test.py
+++ b/scripts/test/MultiPlotting/QuickEditPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
from MultiPlotting.QuickEdit.quickEdit_view import QuickEditView
diff --git a/scripts/test/MultiPlotting/QuickEditWidget_test.py b/scripts/test/MultiPlotting/QuickEditWidget_test.py
index 522fb58d09f..cb2f419c58d 100644
--- a/scripts/test/MultiPlotting/QuickEditWidget_test.py
+++ b/scripts/test/MultiPlotting/QuickEditWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.QuickEdit.quickEdit_presenter import QuickEditPresenter
diff --git a/scripts/test/MultiPlotting/SubPlotContext_test.py b/scripts/test/MultiPlotting/SubPlotContext_test.py
index 88581ee0fce..06a4e3db028 100644
--- a/scripts/test/MultiPlotting/SubPlotContext_test.py
+++ b/scripts/test/MultiPlotting/SubPlotContext_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.subplot.subplot_context import subplotContext
from mantid import plots
diff --git a/scripts/test/MultiPlotting/SubplotADSObserver_test.py b/scripts/test/MultiPlotting/SubplotADSObserver_test.py
index 38221055593..a5c1f9ccf4c 100644
--- a/scripts/test/MultiPlotting/SubplotADSObserver_test.py
+++ b/scripts/test/MultiPlotting/SubplotADSObserver_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from MultiPlotting.subplot.subplot_ADS_observer import SubplotADSObserver
diff --git a/scripts/test/MultiPlotting/Subplot_test.py b/scripts/test/MultiPlotting/Subplot_test.py
index 1dc992905b3..c687d3f5db6 100644
--- a/scripts/test/MultiPlotting/Subplot_test.py
+++ b/scripts/test/MultiPlotting/Subplot_test.py
@@ -7,7 +7,7 @@
import unittest
from matplotlib.gridspec import GridSpec
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from MultiPlotting.multi_plotting_context import PlottingContext
diff --git a/scripts/test/Muon/FFTModel_test.py b/scripts/test/Muon/FFTModel_test.py
index 8adaef52318..ec31ab2e2e0 100644
--- a/scripts/test/Muon/FFTModel_test.py
+++ b/scripts/test/Muon/FFTModel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_model
diff --git a/scripts/test/Muon/FFTPresenter_test.py b/scripts/test/Muon/FFTPresenter_test.py
index 5bb8785021c..22c67e7a15b 100644
--- a/scripts/test/Muon/FFTPresenter_test.py
+++ b/scripts/test/Muon/FFTPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.utilities import load_utils
from Muon.GUI.Common import thread_model
from Muon.GUI.FrequencyDomainAnalysis.FFT import fft_presenter
diff --git a/scripts/test/Muon/LoadWidgetPresenter_test.py b/scripts/test/Muon/LoadWidgetPresenter_test.py
index ea31d27666a..df1a421f50c 100644
--- a/scripts/test/Muon/LoadWidgetPresenter_test.py
+++ b/scripts/test/Muon/LoadWidgetPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_widget.load_presenter import LoadPresenter
diff --git a/scripts/test/Muon/LoadWidgetView_test.py b/scripts/test/Muon/LoadWidgetView_test.py
index ea17a98f35a..9b561918275 100644
--- a/scripts/test/Muon/LoadWidgetView_test.py
+++ b/scripts/test/Muon/LoadWidgetView_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_widget.load_view import LoadView
diff --git a/scripts/test/Muon/MaxEntModel_test.py b/scripts/test/Muon/MaxEntModel_test.py
index c86e1f86b3a..fd581cc3060 100644
--- a/scripts/test/Muon/MaxEntModel_test.py
+++ b/scripts/test/Muon/MaxEntModel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt import maxent_model
diff --git a/scripts/test/Muon/MaxEntPresenter_test.py b/scripts/test/Muon/MaxEntPresenter_test.py
index 4cd9d797175..3052865bf64 100644
--- a/scripts/test/Muon/MaxEntPresenter_test.py
+++ b/scripts/test/Muon/MaxEntPresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.utilities import load_utils
from Muon.GUI.Common import thread_model
from Muon.GUI.FrequencyDomainAnalysis.MaxEnt import maxent_presenter
diff --git a/scripts/test/Muon/PlottingView_test.py b/scripts/test/Muon/PlottingView_test.py
index 53ecd1116e7..daac1f7b07d 100644
--- a/scripts/test/Muon/PlottingView_test.py
+++ b/scripts/test/Muon/PlottingView_test.py
@@ -9,7 +9,7 @@ import unittest
from matplotlib.figure import Figure
from mantid import WorkspaceFactory, plots
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.Plotting.subPlot_object import subPlot
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
index f9b94445cd8..ae158e1a7ea 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTableModel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_model import PeriodicTableModel
diff --git a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
index 4acee58568b..41a5d786380 100644
--- a/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/PeriodicTablePresenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import PeriodicTable as silxPT, PeriodicTableItem
diff --git a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
index 23c2cd7408e..aac65011d05 100644
--- a/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
+++ b/scripts/test/Muon/elemental_analysis/detectors_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.Detectors.detectors_presenter import DetectorsPresenter
diff --git a/scripts/test/Muon/elemental_analysis/element_button_test.py b/scripts/test/Muon/elemental_analysis/element_button_test.py
index 40bc461479e..d5aeff0c41d 100644
--- a/scripts/test/Muon/elemental_analysis/element_button_test.py
+++ b/scripts/test/Muon/elemental_analysis/element_button_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import ColoredPeriodicTableItem, _ElementButton
diff --git a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
index e91a3f9a52f..a42926908ee 100644
--- a/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
+++ b/scripts/test/Muon/elemental_analysis/elemental_analysis_test.py
@@ -7,7 +7,7 @@
import copy
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from testhelpers import assertRaisesNothing
diff --git a/scripts/test/Muon/elemental_analysis/lmodel_test.py b/scripts/test/Muon/elemental_analysis/lmodel_test.py
index 8de0ec2f4a8..4b39366be2e 100644
--- a/scripts/test/Muon/elemental_analysis/lmodel_test.py
+++ b/scripts/test/Muon/elemental_analysis/lmodel_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.LoadWidget.load_utils import LModel
diff --git a/scripts/test/Muon/elemental_analysis/load_model_test.py b/scripts/test/Muon/elemental_analysis/load_model_test.py
index 171f107ceda..00474d80354 100644
--- a/scripts/test/Muon/elemental_analysis/load_model_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import mantid.simpleapi as mantid
from Muon.GUI.ElementalAnalysis.LoadWidget import load_model
diff --git a/scripts/test/Muon/elemental_analysis/load_utils_test.py b/scripts/test/Muon/elemental_analysis/load_utils_test.py
index 3a812e303f7..31b8c22e6d2 100644
--- a/scripts/test/Muon/elemental_analysis/load_utils_test.py
+++ b/scripts/test/Muon/elemental_analysis/load_utils_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.ElementalAnalysis.LoadWidget import load_utils as lutils
diff --git a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
index 6a779ef519d..766b19c3958 100644
--- a/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
+++ b/scripts/test/Muon/elemental_analysis/peak_selector_view_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.checkbox import Checkbox
diff --git a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
index c28f476cc13..306af99d87b 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_combo_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
import Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table as periodic_table
diff --git a/scripts/test/Muon/elemental_analysis/periodic_list_test.py b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
index 978df4affcd..4739a344129 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_list_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_list_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtWidgets
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
index 33c165ca34b..ea6e46960bf 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_item_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table as periodic_table
from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import PeriodicTableItem,\
diff --git a/scripts/test/Muon/elemental_analysis/periodic_table_test.py b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
index 6c849cab158..6a3bd1c170a 100644
--- a/scripts/test/Muon/elemental_analysis/periodic_table_test.py
+++ b/scripts/test/Muon/elemental_analysis/periodic_table_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from testhelpers import assertRaisesNothing
diff --git a/scripts/test/Muon/fft_presenter_context_interaction_test.py b/scripts/test/Muon/fft_presenter_context_interaction_test.py
index a3792a34535..dba5260bb30 100644
--- a/scripts/test/Muon/fft_presenter_context_interaction_test.py
+++ b/scripts/test/Muon/fft_presenter_context_interaction_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.muon_pair import MuonPair
diff --git a/scripts/test/Muon/fit_information_test.py b/scripts/test/Muon/fit_information_test.py
index 65acee7de12..ffb8d5de434 100644
--- a/scripts/test/Muon/fit_information_test.py
+++ b/scripts/test/Muon/fit_information_test.py
@@ -8,7 +8,7 @@ import unittest
from mantid.api import AnalysisDataService, WorkspaceFactory
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FitInformation
diff --git a/scripts/test/Muon/fit_parameters_test.py b/scripts/test/Muon/fit_parameters_test.py
index 7b953cefa12..b7f5d25e7f4 100644
--- a/scripts/test/Muon/fit_parameters_test.py
+++ b/scripts/test/Muon/fit_parameters_test.py
@@ -7,7 +7,7 @@
from collections import OrderedDict
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FitParameters
diff --git a/scripts/test/Muon/fitting_context_test.py b/scripts/test/Muon/fitting_context_test.py
index e60af0d45e1..31a0a5361c7 100644
--- a/scripts/test/Muon/fitting_context_test.py
+++ b/scripts/test/Muon/fitting_context_test.py
@@ -10,7 +10,7 @@ from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.fitting_context import FittingContext, FitInformation, FitParameters
diff --git a/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py b/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
index 21e54e552cf..f2eb4885c7d 100644
--- a/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/fitting_tab_model_test.py
@@ -9,7 +9,7 @@ from Muon.GUI.Common.fitting_tab_widget.fitting_tab_model import FittingTabModel
from Muon.GUI.Common.test_helpers.context_setup import setup_context
from mantid.api import FunctionFactory, AnalysisDataService
from mantid.simpleapi import CreateWorkspace
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py b/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
index 7f4a8c77631..c88c97fd0fe 100644
--- a/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/fitting_tab_presenter_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FunctionFactory, MultiDomainFunction
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtWidgets
from Muon.GUI.Common.fitting_tab_widget.fitting_tab_widget import FittingTabWidget
diff --git a/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py b/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
index 09318ac1db6..6a42735fd04 100644
--- a/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
+++ b/scripts/test/Muon/fitting_tab_widget/workspace_selector_dialog_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.fitting_tab_widget.workspace_selector_view import WorkspaceSelectorView
diff --git a/scripts/test/Muon/frequency_domain_context_test.py b/scripts/test/Muon/frequency_domain_context_test.py
index ea083c271a8..8b4ba58bfcd 100644
--- a/scripts/test/Muon/frequency_domain_context_test.py
+++ b/scripts/test/Muon/frequency_domain_context_test.py
@@ -8,7 +8,7 @@ import sys
import unittest
from Muon.GUI.FrequencyDomainAnalysis.frequency_context import MaxEnt, FFT, FrequencyContext, FREQUENCY_EXTENSIONS
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateWorkspace, AnalysisDataService
diff --git a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
index 8d9ac2bc0ee..7e20a06f47a 100644
--- a/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_tab_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantid import ConfigService
from mantid.api import FileFinder
diff --git a/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py b/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
index af786183648..d6829685bdc 100644
--- a/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/grouping_table_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py b/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
index 44414050c17..42805ad84b2 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_alpha_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py b/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
index 0416f97783c..4bc8b998813 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_group_selector_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
index 052d81b9cc7..7267782fe62 100644
--- a/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
+++ b/scripts/test/Muon/grouping_tab/pairing_table_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/help_widget_presenter_test.py b/scripts/test/Muon/help_widget_presenter_test.py
index 19405ce185f..d358adbcc68 100644
--- a/scripts/test/Muon/help_widget_presenter_test.py
+++ b/scripts/test/Muon/help_widget_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from mantidqt.widgets import manageuserdirectories
diff --git a/scripts/test/Muon/home_instrument_widget_test.py b/scripts/test/Muon/home_instrument_widget_test.py
index 88b83e76f70..2f898745432 100644
--- a/scripts/test/Muon/home_instrument_widget_test.py
+++ b/scripts/test/Muon/home_instrument_widget_test.py
@@ -8,7 +8,7 @@ import unittest
from mantid.api import FileFinder, AnalysisDataService
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
from mantid.simpleapi import LoadMuonNexus, CompareWorkspaces
diff --git a/scripts/test/Muon/home_runinfo_presenter_test.py b/scripts/test/Muon/home_runinfo_presenter_test.py
index 2d10bac54cc..c440d74ed74 100644
--- a/scripts/test/Muon/home_runinfo_presenter_test.py
+++ b/scripts/test/Muon/home_runinfo_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QWidget
diff --git a/scripts/test/Muon/list_selector/list_selector_presenter_test.py b/scripts/test/Muon/list_selector/list_selector_presenter_test.py
index 882c89f28bf..73f2b5c0dff 100644
--- a/scripts/test/Muon/list_selector/list_selector_presenter_test.py
+++ b/scripts/test/Muon/list_selector/list_selector_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.list_selector.list_selector_presenter import ListSelectorPresenter
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
index dadc53aff55..268b90193d7 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_multiple_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
from Muon.GUI.Common.load_file_widget.model import BrowseFileWidgetModel
diff --git a/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py b/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
index ded224c8d3d..994a355ba90 100644
--- a/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
+++ b/scripts/test/Muon/load_file_widget/loadfile_presenter_single_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
diff --git a/scripts/test/Muon/load_run_widget/loadrun_model_test.py b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
index 07a7d2f8259..ba9a730c416 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_model_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
index fe63c8a9ea0..cc02c7cce37 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
@@ -5,8 +5,8 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QMessageBox, QWidget
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
index 2972e6a8c34..2d9b5ec4d81 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
@@ -7,7 +7,7 @@
import os
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
index 4000a016acd..2062f0dd861 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
index b1dcf15a3d9..fe7039204c7 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
index debf6dce580..cffe14f6f5e 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_failure_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
index ee6f53e7bfe..fd0a9dc2c23 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_multiple_file_test.py
@@ -9,7 +9,7 @@ import time
from mantid import ConfigService
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py b/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
index 639f27c4d0e..ac0b87936fb 100644
--- a/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
+++ b/scripts/test/Muon/loading_tab/loadwidget_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication, QWidget
diff --git a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
index 9ccda4c0f60..8c1852e70e0 100644
--- a/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
+++ b/scripts/test/Muon/max_ent_presenter_load_interaction_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy import QtCore
diff --git a/scripts/test/Muon/muon_context_with_frequency_test.py b/scripts/test/Muon/muon_context_with_frequency_test.py
index e45ff09b51d..b608b8e45be 100644
--- a/scripts/test/Muon/muon_context_with_frequency_test.py
+++ b/scripts/test/Muon/muon_context_with_frequency_test.py
@@ -8,7 +8,7 @@ import unittest
from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from mantid import ConfigService
from mantid.dataobjects import Workspace2D
from mantid.simpleapi import CreateWorkspace
diff --git a/scripts/test/Muon/muon_data_context_test.py b/scripts/test/Muon/muon_data_context_test.py
index 3d1c392cfa3..596d59ef762 100644
--- a/scripts/test/Muon/muon_data_context_test.py
+++ b/scripts/test/Muon/muon_data_context_test.py
@@ -9,7 +9,7 @@ import unittest
from mantidqt.utils.qt.testing import start_qapplication
from mantid.api import AnalysisDataService, FileFinder
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.contexts.muon_data_context import MuonDataContext
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/test/Muon/muon_group_pair_context_test.py b/scripts/test/Muon/muon_group_pair_context_test.py
index 67f1c137a20..3477de36934 100644
--- a/scripts/test/Muon/muon_group_pair_context_test.py
+++ b/scripts/test/Muon/muon_group_pair_context_test.py
@@ -9,7 +9,7 @@ import unittest
from Muon.GUI.Common.contexts.muon_group_pair_context import MuonGroupPairContext
from Muon.GUI.Common.muon_group import MuonGroup
from Muon.GUI.Common.muon_pair import MuonPair
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.test_helpers.general_test_helpers import create_group_populated_by_two_workspace
diff --git a/scripts/test/Muon/muon_gui_context_test.py b/scripts/test/Muon/muon_gui_context_test.py
index 81ae83f04d0..1ddd58bf39a 100644
--- a/scripts/test/Muon/muon_gui_context_test.py
+++ b/scripts/test/Muon/muon_gui_context_test.py
@@ -8,7 +8,7 @@ import sys
import unittest
from Muon.GUI.Common.contexts.muon_gui_context import MuonGuiContext
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.observer_pattern import Observer
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py b/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
index c2bffaaf43c..edaaac7e289 100644
--- a/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
+++ b/scripts/test/Muon/phase_table_widget/phase_table_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
from qtpy import QtCore
diff --git a/scripts/test/Muon/plotting_widget_freq_test.py b/scripts/test/Muon/plotting_widget_freq_test.py
index 70c8413aafc..affdd4d2516 100644
--- a/scripts/test/Muon/plotting_widget_freq_test.py
+++ b/scripts/test/Muon/plotting_widget_freq_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
diff --git a/scripts/test/Muon/plotting_widget_model_test.py b/scripts/test/Muon/plotting_widget_model_test.py
index 2925c404bab..d48e00815bb 100644
--- a/scripts/test/Muon/plotting_widget_model_test.py
+++ b/scripts/test/Muon/plotting_widget_model_test.py
@@ -6,8 +6,8 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
-from mantid.py3compat.mock import patch
+from unittest import mock
+from unittest.mock import patch
from Muon.GUI.Common.plotting_widget.plotting_widget_model import PlotWidgetModel
from mantid.simpleapi import *
diff --git a/scripts/test/Muon/plotting_widget_test.py b/scripts/test/Muon/plotting_widget_test.py
index da98b429c56..18a7ae44007 100644
--- a/scripts/test/Muon/plotting_widget_test.py
+++ b/scripts/test/Muon/plotting_widget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
diff --git a/scripts/test/Muon/plotting_widget_tiled_test.py b/scripts/test/Muon/plotting_widget_tiled_test.py
index 5339cc0e7fa..49c13098d01 100644
--- a/scripts/test/Muon/plotting_widget_tiled_test.py
+++ b/scripts/test/Muon/plotting_widget_tiled_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.plotting_widget.plotting_widget_presenter import PlotWidgetPresenter
from Muon.GUI.Common.contexts.fitting_context import FitInformation
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
index e28a1ceaeaa..a05bd82c292 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_model_test.py
@@ -12,7 +12,7 @@ import unittest
from mantid.api import AnalysisDataService, ITableWorkspace, WorkspaceFactory, WorkspaceGroup
from mantid.kernel import FloatTimeSeriesProperty, StringPropertyWithValue
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import Load
from mantidqt.utils.qt.testing import start_qapplication
diff --git a/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py b/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
index 5b094817e14..85b6d348ac8 100644
--- a/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
+++ b/scripts/test/Muon/results_tab_widget/results_tab_presenter_test.py
@@ -5,7 +5,7 @@
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.results_tab_widget.results_tab_presenter import ResultsTabPresenter
RESULTS_TAB_MODEL_CLS = 'Muon.GUI.Common.results_tab_widget.results_tab_model.ResultsTabModel'
diff --git a/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py b/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
index 96b3f6d400f..18565d9c08d 100644
--- a/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
+++ b/scripts/test/Muon/seq_fitting_tab_widget/seq_fitting_tab_presenter_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.api import FunctionFactory, MultiDomainFunction
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.seq_fitting_tab_widget.seq_fitting_tab_presenter import SeqFittingTabPresenter
from Muon.GUI.Common.test_helpers.context_setup import setup_context
diff --git a/scripts/test/Muon/transformWidget_test.py b/scripts/test/Muon/transformWidget_test.py
index c1c6bc3d39e..3349f91756a 100644
--- a/scripts/test/Muon/transformWidget_test.py
+++ b/scripts/test/Muon/transformWidget_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.utilities import load_utils
diff --git a/scripts/test/Muon/transform_widget_new_test.py b/scripts/test/Muon/transform_widget_new_test.py
index a8f3c21fe79..6150293de12 100644
--- a/scripts/test/Muon/transform_widget_new_test.py
+++ b/scripts/test/Muon/transform_widget_new_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
# need to write tests for new GUI
diff --git a/scripts/test/Muon/utilities/load_utils_test.py b/scripts/test/Muon/utilities/load_utils_test.py
index 4f4efaa0457..adf6ac05fec 100644
--- a/scripts/test/Muon/utilities/load_utils_test.py
+++ b/scripts/test/Muon/utilities/load_utils_test.py
@@ -10,7 +10,7 @@ import unittest
from mantid import simpleapi, ConfigService
from mantid.api import AnalysisDataService, ITableWorkspace
-from mantid.py3compat import mock
+from unittest import mock
def create_simple_workspace(data_x, data_y, run_number=0):
diff --git a/scripts/test/Muon/utilities/muon_file_utils_test.py b/scripts/test/Muon/utilities/muon_file_utils_test.py
index 8eb53adc91e..abf1cc6f5e7 100644
--- a/scripts/test/Muon/utilities/muon_file_utils_test.py
+++ b/scripts/test/Muon/utilities/muon_file_utils_test.py
@@ -8,7 +8,7 @@ import os
from io import StringIO
import unittest
-from mantid.py3compat import mock
+from unittest import mock
import Muon.GUI.Common.utilities.muon_file_utils as utils
diff --git a/scripts/test/Muon/utilities/muon_load_data_test.py b/scripts/test/Muon/utilities/muon_load_data_test.py
index 89599906abc..28343b3a1ff 100644
--- a/scripts/test/Muon/utilities/muon_load_data_test.py
+++ b/scripts/test/Muon/utilities/muon_load_data_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from Muon.GUI.Common.muon_load_data import MuonLoadData
diff --git a/scripts/test/Muon/utilities/thread_model_test.py b/scripts/test/Muon/utilities/thread_model_test.py
index 151ca9497ec..b323721483f 100644
--- a/scripts/test/Muon/utilities/thread_model_test.py
+++ b/scripts/test/Muon/utilities/thread_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from qtpy.QtWidgets import QApplication
diff --git a/scripts/test/Muon/workspace_finder_test.py b/scripts/test/Muon/workspace_finder_test.py
index df5c62f0e0b..016451b3727 100644
--- a/scripts/test/Muon/workspace_finder_test.py
+++ b/scripts/test/Muon/workspace_finder_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantidqt.utils.qt.testing import start_qapplication
from Muon.GUI.Common.test_helpers.context_setup import setup_context
from Muon.GUI.Common.plotting_widget.workspace_finder import WorkspaceFinder
diff --git a/scripts/test/SANS/algorithm_detail/batch_execution_test.py b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
index f4f3eaba284..191cd513490 100644
--- a/scripts/test/SANS/algorithm_detail/batch_execution_test.py
+++ b/scripts/test/SANS/algorithm_detail/batch_execution_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from mantid.simpleapi import CreateSampleWorkspace
from sans.algorithm_detail.batch_execution import (get_all_names_to_save, get_transmission_names_to_save,
ReductionPackage, select_reduction_alg, save_workspace_to_file)
diff --git a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
index 5190b3392d4..73a69ae600b 100644
--- a/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
+++ b/scripts/test/SANS/algorithm_detail/centre_finder_new_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.algorithm_detail.centre_finder_new import centre_finder_new, centre_finder_mass
from sans.common.enums import (SANSDataType, FindDirectionEnum, DetectorType)
from sans.test_helper.test_director import TestDirector
diff --git a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
index 0f355bd929c..c0b2b130601 100644
--- a/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
+++ b/scripts/test/SANS/command_interface/batch_csv_file_parser_test.py
@@ -8,7 +8,7 @@ import os
import unittest
import mantid
-from mantid.py3compat import mock
+from unittest import mock
from sans.command_interface.batch_csv_parser import BatchCsvParser
from sans.common.constants import ALL_PERIODS
from sans.gui_logic.models.RowEntries import RowEntries
diff --git a/scripts/test/SANS/command_interface/isis_command_interface_test.py b/scripts/test/SANS/command_interface/isis_command_interface_test.py
index 3f44c1ceddb..04f1db90ec7 100644
--- a/scripts/test/SANS/command_interface/isis_command_interface_test.py
+++ b/scripts/test/SANS/command_interface/isis_command_interface_test.py
@@ -10,7 +10,7 @@ import unittest
import uuid
-from mantid.py3compat import mock
+from unittest import mock
from sans.command_interface.ISISCommandInterface import MaskFile
diff --git a/scripts/test/SANS/common/file_information_test.py b/scripts/test/SANS/common/file_information_test.py
index ddc96b8acea..32a05b38d73 100644
--- a/scripts/test/SANS/common/file_information_test.py
+++ b/scripts/test/SANS/common/file_information_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid.kernel import DateAndTime
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SampleShape
from sans.common.file_information import (SANSFileInformationFactory, FileType,
SANSInstrument, get_instrument_paths_for_sans_file)
diff --git a/scripts/test/SANS/common/general_functions_test.py b/scripts/test/SANS/common/general_functions_test.py
index 2a3446024b0..4c940b20179 100644
--- a/scripts/test/SANS/common/general_functions_test.py
+++ b/scripts/test/SANS/common/general_functions_test.py
@@ -8,7 +8,7 @@ import unittest
from mantid.api import AnalysisDataService, FrameworkManager
from mantid.kernel import (V3D, Quat)
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.constants import (SANS2D, LOQ, LARMOR)
from sans.common.enums import (ReductionMode, ReductionDimensionality, OutputParts,
SANSInstrument, DetectorType, SANSFacility, DataType)
diff --git a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
index e9a62759759..80ce7e4f608 100644
--- a/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/add_runs_presenter_test.py
@@ -10,7 +10,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
from mantid.kernel import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.models import SumRunsModel
from sans.gui_logic.models.SumRunsModel import SumRunsModel
diff --git a/scripts/test/SANS/gui_logic/batch_process_runner_test.py b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
index 81f8fe7b353..a1d45680e89 100644
--- a/scripts/test/SANS/gui_logic/batch_process_runner_test.py
+++ b/scripts/test/SANS/gui_logic/batch_process_runner_test.py
@@ -7,7 +7,7 @@
import unittest
from qtpy.QtCore import QThreadPool
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (OutputMode)
from sans.gui_logic.models.batch_process_runner import BatchProcessRunner
diff --git a/scripts/test/SANS/gui_logic/beam_centre_model_test.py b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
index 1ab0bbfbb06..f9111622137 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_model_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_model_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import FindDirectionEnum, SANSInstrument, DetectorType
from sans.gui_logic.models.beam_centre_model import BeamCentreModel
diff --git a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
index e2299976cb2..7648fe7051f 100644
--- a/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/beam_centre_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.presenter.beam_centre_presenter import BeamCentrePresenter
from sans.test_helper.mock_objects import create_mock_beam_centre_tab
diff --git a/scripts/test/SANS/gui_logic/create_state_test.py b/scripts/test/SANS/gui_logic/create_state_test.py
index a94acbd638a..a0899c819dd 100644
--- a/scripts/test/SANS/gui_logic/create_state_test.py
+++ b/scripts/test/SANS/gui_logic/create_state_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (SANSFacility, SaveType)
from sans.gui_logic.models.RowEntries import RowEntries
from sans.gui_logic.models.create_state import (create_states, create_gui_state_from_userfile)
diff --git a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
index 78c8b2f581c..293fa8d0a10 100644
--- a/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/diagnostics_page_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import SANSInstrument, DetectorType, IntegralEnum, SANSFacility
from sans.gui_logic.presenter.diagnostic_presenter import DiagnosticsPagePresenter
from sans.test_helper.mock_objects import create_mock_diagnostics_tab
diff --git a/scripts/test/SANS/gui_logic/gui_common_test.py b/scripts/test/SANS/gui_logic/gui_common_test.py
index 673eca72545..9dfd627c38f 100644
--- a/scripts/test/SANS/gui_logic/gui_common_test.py
+++ b/scripts/test/SANS/gui_logic/gui_common_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import (SANSInstrument, ReductionMode)
from sans.gui_logic.gui_common import (get_reduction_mode_strings_for_gui, get_reduction_selection,
get_string_for_gui_from_reduction_mode,
diff --git a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
index 685dd05722a..40e13f81515 100644
--- a/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/masking_table_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.masking_table_presenter import (MaskingTablePresenter, masking_information)
from sans.test_helper.mock_objects import (FakeState, create_mock_masking_table, create_run_tab_presenter_mock)
diff --git a/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py b/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
index 878613d3e88..aff1e6bf6ae 100644
--- a/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
+++ b/scripts/test/SANS/gui_logic/presenter_tests/presenter_common_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.presenter_common import PresenterCommon
diff --git a/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py b/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
index f3b493ae9bb..ab517513df4 100644
--- a/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/presenter_tests/settings_adjustment_presenter_test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat.mock import Mock
+from unittest.mock import Mock
from sans.common.enums import SANSInstrument
from sans.gui_logic.presenter.settings_adjustment_presenter import SettingsAdjustmentPresenter
diff --git a/scripts/test/SANS/gui_logic/run_selector_presenter_test.py b/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
index a7796b5c40a..89fe7ae1029 100644
--- a/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/run_selector_presenter_test.py
@@ -8,7 +8,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.models.RunSelectionModel import RunSelectionModel
from sans.gui_logic.models.run_file import SummableRunFile
from sans.gui_logic.models.run_finder import SummableRunFinder
diff --git a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
index 78e0fb12154..d55b5055617 100644
--- a/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/run_tab_presenter_test.py
@@ -8,7 +8,7 @@ import unittest
from mantid.kernel import PropertyManagerDataService
from mantid.kernel import config
-from mantid.py3compat import mock
+from unittest import mock
from sans.command_interface.batch_csv_parser import BatchCsvParser
from sans.common.enums import SANSInstrument
from sans.common.enums import (SANSFacility, ReductionDimensionality, SaveType, ReductionMode,
diff --git a/scripts/test/SANS/gui_logic/save_other_presenter_test.py b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
index 54dec859637..ba3d9c6c0a0 100644
--- a/scripts/test/SANS/gui_logic/save_other_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/save_other_presenter_test.py
@@ -7,7 +7,7 @@
import unittest
from mantid import ConfigService
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.save_other_presenter import SaveOtherPresenter
diff --git a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
index 4cbf51f7e09..6b8325149a2 100644
--- a/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/settings_diagnostic_presenter_test.py
@@ -9,7 +9,7 @@ import os
import tempfile
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.gui_logic.presenter.settings_diagnostic_presenter import SettingsDiagnosticPresenter
from sans.state.Serializer import Serializer
from sans.test_helper.mock_objects import (create_run_tab_presenter_mock, FakeState,
diff --git a/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py b/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
index 86effd26792..5f5eea15780 100644
--- a/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
+++ b/scripts/test/SANS/gui_logic/summation_settings_presenter_test.py
@@ -8,7 +8,7 @@ import unittest
from assert_called import assert_called
from fake_signal import FakeSignal
-from mantid.py3compat import mock
+from unittest import mock
from sans.common.enums import BinningType
from sans.gui_logic.models.SummationSettingsModel import SummationSettingsModel
from sans.gui_logic.presenter.summation_settings_presenter import SummationSettingsPresenter
diff --git a/scripts/test/SANS/state/StateBuilderTest.py b/scripts/test/SANS/state/StateBuilderTest.py
index 5c82072ef00..757439099e0 100644
--- a/scripts/test/SANS/state/StateBuilderTest.py
+++ b/scripts/test/SANS/state/StateBuilderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.state.IStateParser import IStateParser
from sans.state.StateRunDataBuilder import StateRunDataBuilder
diff --git a/scripts/test/SANS/state/StateRunDataBuilderTest.py b/scripts/test/SANS/state/StateRunDataBuilderTest.py
index d56154dec06..23a17d85f58 100644
--- a/scripts/test/SANS/state/StateRunDataBuilderTest.py
+++ b/scripts/test/SANS/state/StateRunDataBuilderTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from sans.state.StateRunDataBuilder import StateRunDataBuilder
from sans.state.StateObjects.StateScale import StateScale
diff --git a/scripts/test/TOFTOF/TOFTOFGUITest.py b/scripts/test/TOFTOF/TOFTOFGUITest.py
index 629be0e0402..24254df8383 100644
--- a/scripts/test/TOFTOF/TOFTOFGUITest.py
+++ b/scripts/test/TOFTOF/TOFTOFGUITest.py
@@ -7,7 +7,7 @@
from qtpy.QtWidgets import QApplication
import unittest
-from mantid.py3compat import mock
+from unittest import mock
from reduction_gui.reduction.toftof.toftof_reduction import TOFTOFScriptElement, OptionalFloat
from reduction_gui.widgets.toftof.toftof_setup import TOFTOFSetupWidget
--
GitLab