FIX: mne base-class name changes

eelbrain/_data_obj.py

@@ -53,6 +53,7 @@
 from . import _colorspaces as cs
 from ._utils import deprecated, ui, LazyProperty, natsorted
 from ._utils.numpy_utils import slice_to_arange, full_slice, digitize
+from .mne_fixes import MNE_EPOCHS, MNE_EVOKED, MNE_RAW, MNE_LABEL
 from functools import reduce
 
 
@@ -71,10 +72,6 @@
 
 UNNAMED = '<?>'
 LIST_INDEX_TYPES = (int, slice)
-MNE_RAW_TYPES = (mne.io.Raw, mne.io.RawArray, mne.io.kit.kit.RawKIT)
-MNE_EPOCHS_TYPES = (mne.Epochs, mne.EpochsArray)
-MNE_EVOKED_TYPES = mne.Evoked
-MNE_LABEL_TYPES = (mne.Label, mne.label.BiHemiLabel)
 _pickled_ds_wildcard = ("Pickled Dataset (*.pickled)", '*.pickled')
 _tex_wildcard = ("TeX (*.tex)", '*.tex')
 _tsv_wildcard = ("Plain Text Tab Separated Values (*.txt)", '*.txt')
@@ -452,7 +449,7 @@ def asepochs(x, sub=None, ds=None, n=None):
             raise TypeError(err)
         x = ds.eval(x)
 
-    if isinstance(x, MNE_EPOCHS_TYPES):
+    if isinstance(x, MNE_EPOCHS):
         pass
     else:
         raise TypeError("Need mne Epochs object, got %s" % repr(x))
@@ -521,18 +518,18 @@ def asndvar(x, sub=None, ds=None, n=None):
         x = ds.eval(x)
 
     # convert MNE objects
-    if isinstance(x, MNE_EPOCHS_TYPES):
+    if isinstance(x, MNE_EPOCHS):
         from .load.fiff import epochs_ndvar
         x = epochs_ndvar(x)
-    elif isinstance(x, MNE_EVOKED_TYPES):
+    elif isinstance(x, MNE_EVOKED):
         from .load.fiff import evoked_ndvar
         x = evoked_ndvar(x)
-    elif isinstance(x, MNE_RAW_TYPES):
+    elif isinstance(x, MNE_RAW):
         from .load.fiff import raw_ndvar
         x = raw_ndvar(x)
     elif isinstance(x, list):
         item_0 = x[0]
-        if isinstance(item_0, MNE_EVOKED_TYPES):
+        if isinstance(item_0, MNE_EVOKED):
             from .load.fiff import evoked_ndvar
             x = evoked_ndvar(x)
 
@@ -5446,7 +5443,7 @@ def aggregate(self, x=None, drop_empty=True, name='{name}', count='n',
             try:
                 if hasattr(v, 'aggregate'):
                     ds[k] = v.aggregate(x)
-                elif isinstance(v, MNE_EPOCHS_TYPES):
+                elif isinstance(v, MNE_EPOCHS):
                     evokeds = []
                     for cell in x.cells:
                         idx = (x == cell)
@@ -8308,7 +8305,7 @@ def coordinates(self):
         return coords
 
     def dimindex(self, arg):
-        if isinstance(arg, MNE_LABEL_TYPES):
+        if isinstance(arg, MNE_LABEL):
             return self._dimindex_label(arg)
         elif isinstance(arg, basestring):
             if arg == 'lh':

eelbrain/_wxgui/select_epochs.py

@@ -19,26 +19,26 @@
 import re
 import time
 
-import mne
 import numpy as np
 from scipy.spatial.distance import cdist
 import wx
 
-from .. import load, save, plot, fmtxt
-from .._data_obj import Dataset, Factor, Var, Datalist, asndvar, combine
-from .._ndvar import neighbor_correlation
 from .. import _meeg as meeg
 from .. import _report
-from .._names import INTERPOLATE_CHANNELS
+from .. import load, save, plot, fmtxt
+from .._data_obj import Dataset, Factor, Var, Datalist, asndvar, combine
 from .._info import BAD_CHANNELS
+from .._names import INTERPOLATE_CHANNELS
+from .._ndvar import neighbor_correlation
 from .._utils.parse import FLOAT_PATTERN, POS_FLOAT_PATTERN, INT_PATTERN
-from ..plot._base import find_axis_params_data, find_axis_params_dim, \
-    find_fig_vlims, find_fig_cmaps
+from .._utils.numpy_utils import full_slice
+from .._wxutils import Icon, ID, REValidator
+from ..mne_fixes import MNE_EPOCHS
+from ..plot._base import (find_axis_params_data, find_axis_params_dim,
+                          find_fig_vlims, find_fig_cmaps)
 from ..plot._nuts import _plt_bin_nuts
 from ..plot._topo import _ax_topomap
 from ..plot._utsnd import _ax_bfly_epoch
-from .._utils.numpy_utils import full_slice
-from .._wxutils import Icon, ID, REValidator
 from .app import get_app
 from .frame import EelbrainDialog
 from .mpl_canvas import FigureCanvasPanel
@@ -166,7 +166,7 @@ def __init__(self, ds, data='meg', accept='accept', blink='blink',
             command). If the file exists, it is loaded as initial state.
         """
         FileDocument.__init__(self, path)
-        if isinstance(ds, mne.Epochs):
+        if isinstance(ds, MNE_EPOCHS):
             epochs = ds
             ds = Dataset()
             epochs.load_data()

eelbrain/load/fiff.py

@@ -114,8 +114,9 @@
 from .. import _colorspaces as _cs
 from .._info import BAD_CHANNELS
 from .._utils import ui
-from .._data_obj import Var, NDVar, Dataset, Sensor, SourceSpace, UTS, \
-    _matrix_graph
+from .._data_obj import (Var, NDVar, Dataset, Sensor, SourceSpace, UTS,
+                         _matrix_graph)
+from ..mne_fixes import MNE_EVOKED
 
 
 KIT_NEIGHBORS = {
@@ -852,7 +853,7 @@ def evoked_ndvar(evoked, name=None, data=None, exclude='bads', vmax=None,
     if isinstance(evoked, basestring):
         evoked = mne.read_evokeds(evoked)
 
-    if isinstance(evoked, mne.Evoked):
+    if isinstance(evoked, MNE_EVOKED):
         case_out = False
         evoked = (evoked,)
     if isinstance(evoked, (tuple, list)):

eelbrain/mne_fixes/__init__.py

@@ -33,3 +33,4 @@
 from ._freesurfer import rename_mri
 from ._interpolation import _interpolate_bads_eeg, _interpolate_bads_meg
 from ._label import write_labels_to_annot
+from ._types import MNE_EPOCHS, MNE_EVOKED, MNE_RAW, MNE_LABEL

eelbrain/mne_fixes/_types.py

@@ -0,0 +1,13 @@
+from distutils.version import LooseVersion
+import mne
+
+
+MNE_VERSION = LooseVersion(mne.__version__)
+if MNE_VERSION >= LooseVersion('0.14'):
+    MNE_EPOCHS = mne.BaseEpochs
+    MNE_RAW = mne.io.BaseRaw
+else:
+    MNE_EPOCHS = mne.epochs._BaseEpochs
+    MNE_RAW = mne.io._BaseRaw
+MNE_EVOKED = mne.Evoked
+MNE_LABEL = (mne.Label, mne.label.BiHemiLabel)