From 5731acef1cec1eef9e7188706996c2699e028d85 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 15 May 2026 09:34:05 -0400 Subject: [PATCH] Simplify `if cond: return True/False else: return False/True` patterns Replace verbose if/else-return-bool constructs with direct return of the condition. In `is_warning_active`, drop the redundant truthiness guard since `isinstance(None, ...)` already returns False. Co-Authored-By: Claude Code 2.1.142 / Claude Opus 4.7 --- spikeinterface_gui/curationview.py | 15 +++------------ spikeinterface_gui/main.py | 10 ++-------- spikeinterface_gui/view_base.py | 4 +--- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/spikeinterface_gui/curationview.py b/spikeinterface_gui/curationview.py index dc92163..21e66c7 100644 --- a/spikeinterface_gui/curationview.py +++ b/spikeinterface_gui/curationview.py @@ -598,24 +598,15 @@ def handle_split(): def _conditional_refresh_merge(self): # Check if the view is active before refreshing - if self.is_view_active() and self.active_table == "merge": - return True - else: - return False + return self.is_view_active() and self.active_table == "merge" def _conditional_refresh_delete(self): # Check if the view is active before refreshing - if self.is_view_active() and self.active_table == "delete": - return True - else: - return False + return self.is_view_active() and self.active_table == "delete" def _conditional_refresh_split(self): # Check if the view is active before refreshing - if self.is_view_active() and self.active_table == "split": - return True - else: - return False + return self.is_view_active() and self.active_table == "split" CurationView._gui_help_txt = """ diff --git a/spikeinterface_gui/main.py b/spikeinterface_gui/main.py index c43cb2c..050b614 100644 --- a/spikeinterface_gui/main.py +++ b/spikeinterface_gui/main.py @@ -293,10 +293,7 @@ def check_folder_is_analyzer(folder): # Check if the folder contains the necessary files for a SortingAnalyzer with open(spikeinterface_info_file, 'r') as f: spikeinterface_info = json.load(f) - if spikeinterface_info.get("object") != "SortingAnalyzer": - return False - else: - return True + return spikeinterface_info.get("object") == "SortingAnalyzer" else: #zarr folder import zarr # Check if the folder contains the necessary files for a SortingAnalyzer @@ -304,10 +301,7 @@ def check_folder_is_analyzer(folder): spikeinterface_info = zarr_root.attrs.get('spikeinterface_info') if spikeinterface_info is None: return False - if spikeinterface_info.get("object") != "SortingAnalyzer": - return False - else: - return True + return spikeinterface_info.get("object") == "SortingAnalyzer" def run_mainwindow_cli(): diff --git a/spikeinterface_gui/view_base.py b/spikeinterface_gui/view_base.py index 06ae99f..25c36b0 100644 --- a/spikeinterface_gui/view_base.py +++ b/spikeinterface_gui/view_base.py @@ -252,9 +252,7 @@ def is_warning_active(self): from .myqt import QT active_window = QT.QApplication.activeWindow() - if active_window and isinstance(active_window, QT.QMessageBox): - return True - return False + return isinstance(active_window, QT.QMessageBox) elif self.backend == "panel": return self._panel_warning_active