Add more missing exports

mne/io/__init__.py

@@ -43,6 +43,7 @@
 # (and _empty_info is convenient to keep here for tests and is private)
 from .._fiff.meas_info import (
     read_info,
+    write_info,
     anonymize_info,
     read_fiducials,
     write_fiducials,

mne/preprocessing/__init__.py

@@ -28,7 +28,6 @@
     maxwell_filter_prepare_emptyroom,
 )
 from .realign import realign_raw
-# from .xdawn import Xdawn
 from ._csd import compute_current_source_density, compute_bridged_electrodes
 
 from .artifact_detection import (
@@ -50,3 +49,8 @@
 from .hfc import compute_proj_hfc
 from ._lof import find_bad_channels_lof
 from ._pca_obs import apply_pca_obs
+
+try:
+    from .xdawn import Xdawn
+except ImportError:
+    pass

mne/time_frequency/__init__.py

@@ -5,20 +5,21 @@
 """Time frequency analysis tools."""
 
 from .tfr import (
-    morlet,
-    tfr_morlet,
     AverageTFR,
     AverageTFRArray,
     BaseTFR,
+    EpochsTFR,
+    EpochsTFRArray,
     RawTFR,
     RawTFRArray,
+    combine_tfr,
+    fwhm,
+    morlet,
+    tfr_array_morlet,
+    tfr_morlet,
     tfr_multitaper,
     read_tfrs,
     write_tfrs,
-    EpochsTFR,
-    EpochsTFRArray,
-    tfr_array_morlet,
-    fwhm,
 )
 from .psd import psd_array_welch
 from .csd import (
@@ -35,6 +36,13 @@
 )
 from .ar import fit_iir_model_raw
 from .multitaper import dpss_windows, psd_array_multitaper, tfr_array_multitaper
-from .spectrum import EpochsSpectrum, Spectrum, read_spectrum
+from .spectrum import (
+    EpochsSpectrum,
+    EpochsSpectrumArray,
+    Spectrum,
+    SpectrumArray,
+    combine_spectrum,
+    read_spectrum,
+)
 from ._stft import stft, istft, stftfreq
 from ._stockwell import tfr_stockwell, tfr_array_stockwell