Removed obsolete __future__ imports

scripts/start_mslice.py

@@ -1,5 +1,3 @@
 #!/usr/bin/python
-from __future__ import absolute_import
-
 from mslice.app import main
 main()

src/mslice/app/mainwindow.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy.QtWidgets import QApplication, QMainWindow, QLabel, QMenu, QStackedLayout
 
 from mslice.models.units import EnergyUnits

src/mslice/cli/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mslice.app import is_gui
 from mslice.plotting.pyplot import *  # noqa: F401, F403
 from matplotlib.axes import Axes

src/mslice/cli/_mslice_commands.py

@@ -1,6 +1,4 @@
 """Defines the additional mslice commands on top of the standard matplotlib plotting commands"""
-from __future__ import (absolute_import, division, print_function)
-
 import os.path as ospath
 
 import matplotlib as mpl

src/mslice/cli/plotfunctions.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 import mslice.plotting.pyplot as plt
 import mslice.app as app
 from mslice.models.workspacemanager.workspace_provider import get_workspace_handle

src/mslice/cli/views/cli_data_loader.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
-
 class CLIDataLoaderWidget:
     """
     A Dataloader Widget dummy class to interface with the presenter classes without doing anything in CLI mode.

src/mslice/cli/views/cli_powder.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mslice.views.interfaces.powder_projection_view import PowderView
 
 

src/mslice/models/colors.py

@@ -16,8 +16,6 @@
 to hex values and both #00bfbf and #00ffff will return
 the string cyan
 """
-from __future__ import (absolute_import, division)
-
 import re
 
 from matplotlib import rcParams

src/mslice/models/cut/cut_functions.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mantid.api import WorkspaceUnitValidator
 
 from mslice.models.workspacemanager.workspace_provider import get_workspace_handle

src/mslice/models/intensity_correction_algs.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from six import string_types
 import numpy as np
 

src/mslice/models/labels.py

@@ -1,6 +1,5 @@
 """Module to create axis and legend labels"""
 
-from __future__ import (absolute_import, division, print_function)
 from mslice.models.units import EnergyUnits
 
 CUT_INTENSITY_LABEL = 'Signal/#Events'

src/mslice/models/projection/powder/make_projection.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import uuid
 from mantid.api import PythonAlgorithm, MatrixWorkspaceProperty, IMDEventWorkspaceProperty
 from mantid.kernel import FloatArrayProperty, Direction, StringMandatoryValidator

src/mslice/models/projection/powder/mantid_projection_calculator.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mslice.models.workspacemanager.workspace_algorithms import propagate_properties
 from mslice.models.workspacemanager.workspace_provider import get_workspace_handle
 from mslice.models.projection.powder.projection_calculator import ProjectionCalculator

src/mslice/models/projection/powder/projection_calculator.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import abc
 
 

src/mslice/models/slice/slice_functions.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import numpy as np
 
 from mantid.api import WorkspaceUnitValidator

src/mslice/models/units.py

@@ -4,8 +4,6 @@
 are defined, but they are separated into a module for possible future expansion.
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 import numpy as np
 
 

src/mslice/models/workspacemanager/file_io.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import os.path
 from qtpy.QtWidgets import QFileDialog
 from mantid.api import MDNormalization

src/mslice/models/workspacemanager/workspace_algorithms.py

@@ -4,8 +4,6 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
-
 import os.path
 from os.path import splitext
 

src/mslice/plotting/backend.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, unicode_literals)
 # system imports
 import importlib
 

src/mslice/plotting/globalfiguremanager.py

@@ -26,7 +26,6 @@
 
 Currently there are only two categories ('1d' and '2d') hard coded into the manager.
 """
-from __future__ import (absolute_import, division, print_function)
 # system imports
 from functools import wraps
 

src/mslice/plotting/plot_window/plot_options.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from numpy import arange as np_arange
 from six import iteritems
 

src/mslice/plotting/plot_window/plot_window.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy import QtCore, QtWidgets
 
 from matplotlib.figure import Figure

src/mslice/presenters/cut_widget_presenter.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mslice.models.cut.cut import Cut
 from .busy import show_busy
 from mslice.models.alg_workspace_ops import get_available_axes, get_axis_range

src/mslice/presenters/data_loader_presenter.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 import os
 
 from .busy import show_busy

src/mslice/presenters/main_presenter.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .interfaces.main_presenter import MainPresenterInterface
 from mantid.api import IMDHistoWorkspace, IMDEventWorkspace
 from collections.abc import Callable

src/mslice/presenters/plot_options_presenter.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from functools import partial
 
 

src/mslice/presenters/powder_projection_presenter.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from .busy import show_busy
 from mslice.models.projection.powder.projection_calculator import ProjectionCalculator
 from mslice.presenters.presenter_utility import PresenterUtility

src/mslice/presenters/slice_widget_presenter.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .busy import show_busy
 from mslice.models.alg_workspace_ops import get_available_axes, get_axis_range
 from mslice.models.axis import Axis

src/mslice/presenters/validation_decorators.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from functools import wraps
 
 

src/mslice/presenters/workspace_manager_presenter.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from six import string_types
 
 from .busy import show_busy

src/mslice/util/compat.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from matplotlib.legend import Legend
 
 

src/mslice/util/mantid/algorithm_wrapper.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from uuid import uuid4
 from six import string_types
 

src/mslice/util/qt/qapp.py

@@ -3,7 +3,6 @@
 #     & Institut Laue - Langevin
 # SPDX - License - Identifier: GPL - 3.0 +
 #
-from __future__ import (absolute_import, unicode_literals)
 from functools import wraps
 
 # make these available in this module for the rest of codebase

src/mslice/views/cut_plotter.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import mslice.plotting.pyplot as plt
 from mslice.plotting.globalfiguremanager import GlobalFigureManager
 

src/mslice/views/interfaces/powder_projection_view.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
-
 class PowderView(object):
     error_occurred = None
     busy = None

src/mslice/views/interfaces/slice_view.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
-
 class SliceView:
     error_occurred = None
     busy = None

src/mslice/views/interfaces/workspace_view.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
-
 class WorkspaceView(object):
     error_occurred = None
     busy = None

src/mslice/views/slice_plotter.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 import mslice.plotting.pyplot as plt
 
 PICKER_TOL_PTS = 5

src/mslice/widgets/cut/command.py

@@ -1,14 +1,5 @@
 """Enumeration for operations allowed in this module
 """
-# -----------------------------------------------------------------------------
-# Imports
-# -----------------------------------------------------------------------------
-
-from __future__ import (absolute_import, division, print_function)
-
-# -----------------------------------------------------------------------------
-# Classes and functions
-# -----------------------------------------------------------------------------
 
 
 class Command(object):

src/mslice/widgets/cut/cut.py

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget
 from mslice.util.qt import load_ui

src/mslice/widgets/dataloader/dataloader.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 import os
 
 from functools import partial

src/mslice/widgets/dataloader/inputdialog.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from qtpy.QtWidgets import QDialog, QFormLayout, QLabel, QDoubleSpinBox, QPushButton, QCheckBox
 
 

src/mslice/widgets/ipythonconsole/ipython_widget.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function)
-
 import warnings
 from mslice.util.mantid import in_mantid
 

src/mslice/widgets/projection/powder/powder.py

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget, QMessageBox
 

src/mslice/widgets/slice/slice.py

@@ -3,8 +3,6 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget
 from mslice.util.qt import load_ui

src/mslice/widgets/status/status.py

@@ -5,8 +5,6 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-from __future__ import (absolute_import, division, print_function)
-
 from qtpy.QtWidgets import QWidget
 
 from mslice.util.qt import load_ui

src/mslice/workspace/histo_mixin.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import numpy as np
 import operator as op
 from mslice.util.numpy_helper import apply_with_corrected_shape, transform_array_to_workspace

src/mslice/workspace/histogram_workspace.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .base import WorkspaceBase
 from .histo_mixin import HistoMixin
 from .workspace_mixin import WorkspaceOperatorMixin, WorkspaceMixin

src/mslice/workspace/pixel_mixin.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .histogram_workspace import HistogramWorkspace
 from mantid.simpleapi import BinMD
 

src/mslice/workspace/pixel_workspace.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .base import WorkspaceBase
 from .histogram_workspace import HistogramWorkspace
 from .pixel_mixin import PixelMixin

src/mslice/workspace/workspace.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from .base import WorkspaceBase
 from .workspace_mixin import WorkspaceOperatorMixin, WorkspaceMixin
 from .helperfunctions import attribute_from_log, attribute_to_log, delete_workspace, rename_workspace

src/mslice/workspace/workspace_mixin.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import numpy as np
 import operator as op
 

tests/cut_widget_presenter_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import mock
 from mock import call, patch
 import unittest

tests/data_loader_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from tempfile import gettempdir
 from os.path import join
 import unittest

tests/figure_manager_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import unittest
 from unittest import mock
 from unittest.mock import call

tests/file_io_test.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mock import patch, Mock, MagicMock
 import numpy as np
 from os.path import join

tests/histogram_workspace_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import numpy as np
 
 from mantid.simpleapi import CreateMDHistoWorkspace

tests/intensity_correction_algs_test.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mock import patch, MagicMock, call
 import numpy as np
 import unittest

tests/intensity_correction_util_test.py

@@ -1,5 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
-
 from mock import patch, MagicMock
 import unittest
 

tests/main_presenter_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import mock
 import unittest
 

tests/pixel_workspace_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import numpy as np
 import unittest
 

tests/plot_figure_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import unittest
 from unittest import mock
 from unittest.mock import patch

tests/plot_options_presenter_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 from mock import MagicMock, PropertyMock, Mock, ANY
 import unittest
 from mslice.presenters.plot_options_presenter import CutPlotOptionsPresenter, SlicePlotOptionsPresenter

tests/powder_projection_presenter_test.py

@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, division, print_function)
 import mock
 import unittest