From a33f1510b4e4d0c9666c5357d7bbee7d0d9de3cb Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Thu, 30 Jan 2020 16:42:36 +0000
Subject: [PATCH] RE #27777 Fix flake8 formatting failures
---
.../tabs/fitting/data_handling/data_model.py | 4 ++--
.../tabs/fitting/data_handling/data_presenter.py | 8 ++++----
.../tabs/fitting/data_handling/data_widget.py | 2 +-
.../fitting/data_handling/test/test_data_presenter.py | 1 -
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py
index 0f1312da95e..f4beef96820 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py
@@ -14,7 +14,7 @@ class FittingDataModel(object):
def __init__(self):
self._loaded_workspaces = {} # Map stores using {WorkspaceName: Workspace}
- def load_files(self, filenames_string: str):
+ def load_files(self, filenames_string):
filenames = [name.strip() for name in filenames_string.split(",")]
for filename in filenames:
ws_name = self._generate_workspace_name(filename)
@@ -26,7 +26,7 @@ class FittingDataModel(object):
format(filename, e))
def get_loaded_workspaces(self):
- # TODO: Remove debug line in next PR, when output is visible in the GUI.
+ # TODO: Remove debug line in next PR, when output is visible in the GUI.
logger.debug("EngDiff2 Tracked Workspaces: {}".format(self._loaded_workspaces.keys()))
return self._loaded_workspaces
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py
index af9cb6e7635..e80f6b0ebbb 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py
@@ -43,7 +43,7 @@ class FittingDataPresenter(object):
def get_loaded_workspaces(self):
return self.model.get_loaded_workspaces()
- def _start_load_worker(self, filenames: str):
+ def _start_load_worker(self, filenames):
"""
Load one to many files into mantid that are tracked by the interface.
:param filenames: Comma separated list of filenames to load
@@ -58,7 +58,7 @@ class FittingDataPresenter(object):
logger.error("Error occurred when loading files.")
self._emit_enable_button_signal()
- def _enable_load_button(self, enabled: bool):
+ def _enable_load_button(self, enabled):
self.view.set_load_button_enabled(enabled)
def _emit_enable_button_signal(self):
@@ -73,11 +73,11 @@ class FittingDataPresenter(object):
def _files_are_valid(self):
return self.view.get_filenames_valid()
- def _validate(self) -> bool:
+ def _validate(self):
if self._is_searching():
create_error_message(self.view, "Mantid is searching for files. Please wait.")
return False
elif not self._files_are_valid():
create_error_message(self.view, "Entered files are not valid.")
return False
- return True
\ No newline at end of file
+ return True
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py
index b50758a4d3d..89073ffea20 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py
@@ -38,4 +38,4 @@ class FittingDataWidget(object):
self.presenter.clear_workspaces()
def replace_workspace(self, name, workspace):
- self.presenter.replace_workspace(name, workspace)
\ No newline at end of file
+ self.presenter.replace_workspace(name, workspace)
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 0d2e1be40bf..946ce712587 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
@@ -69,6 +69,5 @@ class FittingDataPresenterTest(unittest.TestCase):
self.view.sig_enable_load_button.emit.called_with(True)
-
if __name__ == '__main__':
unittest.main()
--
GitLab