From 6b6a3dba3ae2cedf47f089f24d771934252bb821 Mon Sep 17 00:00:00 2001
From: Matthew Andrew <matthew.andrew@stfc.ac.uk>
Date: Mon, 28 Jan 2019 16:36:45 +0000
Subject: [PATCH] Moved exception braces Re #23642
---
.../grouping_tab_widget_presenter.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
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 a1ced72bdcc..1b73a227742 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
@@ -102,14 +102,16 @@ class GroupingTabPresenter(object):
groups, pairs, description = xml_utils.load_grouping_from_XML(filename)
- try:
- self._model.clear()
- for group in groups:
+ self._model.clear()
+ for group in groups:
+ try:
self._model.add_group(group)
- for pair in pairs:
+ except ValueError as error:
+ self._view.display_warning_box(str(error))
+
+ for pair in pairs:
+ if pair.forward_group in self._model.group_names and pair.backward_group in self._model.group_names:
self._model.add_pair(pair)
- except ValueError as error:
- self._view.display_warning_box(str(error))
self.grouping_table_widget.update_view_from_model()
self.pairing_table_widget.update_view_from_model()
--
GitLab