Merge remote-tracking branch 'upstream/main' into maint_fstrings

mne-tools · Jun 19, 2024 · 9b3c45c · 9b3c45c
2 parents 69c1116 + 57afdcc
commit 9b3c45c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/mne_connectivity/base.py b/mne_connectivity/base.py
@@ -905,7 +905,7 @@ def __init__(
         n_epochs_used=None,
         **kwargs,
     ):
-        super(SpectralConnectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             method=method,
@@ -962,7 +962,7 @@ def __init__(
         n_epochs_used=None,
         **kwargs,
     ):
-        super(TemporalConnectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             method=method,
@@ -1013,7 +1013,7 @@ def __init__(
         n_epochs_used=None,
         **kwargs,
     ):
-        super(SpectroTemporalConnectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             method=method,
@@ -1061,7 +1061,7 @@ def __init__(
         spec_method=None,
         **kwargs,
     ):
-        super(EpochSpectralConnectivity, self).__init__(
+        super().__init__(
             data,
             freqs=freqs,
             names=names,
@@ -1098,7 +1098,7 @@ class EpochTemporalConnectivity(TemporalConnectivity):
     def __init__(
         self, data, times, n_nodes, names=None, indices="all", method=None, **kwargs
     ):
-        super(EpochTemporalConnectivity, self).__init__(
+        super().__init__(
             data,
             times=times,
             names=names,
@@ -1145,7 +1145,7 @@ def __init__(
         spec_method=None,
         **kwargs,
     ):
-        super(EpochSpectroTemporalConnectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             freqs=freqs,
@@ -1192,7 +1192,7 @@ def __init__(
         n_epochs_used=None,
         **kwargs,
     ):
-        super(Connectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             method=method,
@@ -1240,7 +1240,7 @@ def __init__(
         n_epochs_used=None,
         **kwargs,
     ):
-        super(EpochConnectivity, self).__init__(
+        super().__init__(
             data,
             names=names,
             method=method,

diff --git a/mne_connectivity/conftest.py b/mne_connectivity/conftest.py
@@ -116,7 +116,7 @@ def matplotlib_config():
 
     class CallbackRegistryReraise(orig):
         def __init__(self, exception_handler=None, signals=None):
-            super(CallbackRegistryReraise, self).__init__(exception_handler)
+            super().__init__(exception_handler)
 
     cbook.CallbackRegistry = CallbackRegistryReraise
 

diff --git a/mne_connectivity/spectral/epochs_bivariate.py b/mne_connectivity/spectral/epochs_bivariate.py
@@ -58,7 +58,7 @@ class _CohEstBase(_EpochMeanConEstBase):
     accumulate_psd = True
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_CohEstBase, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # allocate space for accumulation of CSD
         self._acc = np.zeros(self.csd_shape, dtype=np.complex128)
@@ -114,7 +114,7 @@ class _PLVEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_PLVEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # allocate accumulator
         self._acc = np.zeros(self.csd_shape, dtype=np.complex128)
@@ -138,7 +138,7 @@ class _ciPLVEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_ciPLVEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # allocate accumulator
         self._acc = np.zeros(self.csd_shape, dtype=np.complex128)
@@ -167,7 +167,7 @@ class _PLIEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_PLIEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # allocate accumulator
         self._acc = np.zeros(self.csd_shape)
@@ -209,7 +209,7 @@ class _DPLIEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_DPLIEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # allocate accumulator
         self._acc = np.zeros(self.csd_shape)
@@ -235,7 +235,7 @@ class _WPLIEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_WPLIEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # store  both imag(csd) and abs(imag(csd))
         acc_shape = (2,) + self.csd_shape
@@ -274,7 +274,7 @@ class _WPLIDebiasedEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_WPLIDebiasedEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
         # store imag(csd), abs(imag(csd)), imag(csd)^2
         acc_shape = (3,) + self.csd_shape
         self._acc = np.zeros(acc_shape)
@@ -318,7 +318,7 @@ class _PPCEst(_EpochMeanConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_cons, n_freqs, n_times):
-        super(_PPCEst, self).__init__(n_cons, n_freqs, n_times)
+        super().__init__(n_cons, n_freqs, n_times)
 
         # store csd / abs(csd)
         self._acc = np.zeros(self.csd_shape, dtype=np.complex128)

diff --git a/mne_connectivity/spectral/epochs_multivariate.py b/mne_connectivity/spectral/epochs_multivariate.py
@@ -180,9 +180,7 @@ class _MultivariateCohEstBase(_EpochMeanMultivariateConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_signals, n_cons, n_freqs, n_times, n_jobs=1):
-        super(_MultivariateCohEstBase, self).__init__(
-            n_signals, n_cons, n_freqs, n_times, n_jobs
-        )
+        super().__init__(n_signals, n_cons, n_freqs, n_times, n_jobs)
 
     def compute_con(self, indices, ranks, n_epochs=1):
         """Compute multivariate coherency methods."""
@@ -648,7 +646,7 @@ class _GCEstBase(_EpochMeanMultivariateConEstBase):
     accumulate_psd = False
 
     def __init__(self, n_signals, n_cons, n_freqs, n_times, n_lags, n_jobs=1):
-        super(_GCEstBase, self).__init__(n_signals, n_cons, n_freqs, n_times, n_jobs)
+        super().__init__(n_signals, n_cons, n_freqs, n_times, n_jobs)
 
         self.freq_res = (self.n_freqs - 1) * 2
         if n_lags >= self.freq_res: