MRG, VIZ, MAINT: figure class proof-of-concept

mne/conftest.py

@@ -476,6 +476,7 @@ def pytest_sessionfinish(session, exitstatus):
     n = session.config.option.durations
     if n is None:
         return
+    print('\n')
     try:
         import pytest_harvest
     except ImportError:

mne/defaults.py

@@ -101,7 +101,7 @@ def _handle_default(k, v=None):
         if isinstance(v, dict):
             this_mapping.update(v)
         else:
-            for key in this_mapping.keys():
+            for key in this_mapping:
                 this_mapping[key] = v
     return this_mapping
 

mne/preprocessing/tests/test_ica.py

@@ -447,8 +447,8 @@ def test_ica_core(method, n_components, noise_cov, n_pca_components):
 
     # test for gh-6271 (scaling of ICA traces)
     fig = raw_sources.plot()
-    assert len(fig.axes[0].lines) in (5, 9)
-    for line in fig.axes[0].lines:
+    assert len(fig.mne.ax_main.lines) in (4, 8)
+    for line in fig.mne.ax_main.lines:
         y = line.get_ydata()
         if len(y) > 2:  # actual data, not markers
             assert np.ptp(y) < 15

mne/selection.py

@@ -5,6 +5,7 @@
 # License: BSD (3-clause)
 
 from os import path
+from collections import OrderedDict
 
 import numpy as np
 
@@ -168,9 +169,10 @@ def _divide_to_regions(info, add_stim=True):
         if len(stim_ch) > 0:
             for region in [lf, rf, lo, ro, lp, rp, lt, rt]:
                 region.append(info['ch_names'].index(stim_ch[0]))
-    return {'Left-frontal': lf, 'Right-frontal': rf, 'Left-parietal': lp,
-            'Right-parietal': rp, 'Left-occipital': lo, 'Right-occipital': ro,
-            'Left-temporal': lt, 'Right-temporal': rt}
+    return OrderedDict([('Left-frontal', lf), ('Right-frontal', rf),
+                        ('Left-parietal', lp), ('Right-parietal', rp),
+                        ('Left-occipital', lo), ('Right-occipital', ro),
+                        ('Left-temporal', lt), ('Right-temporal', rt)])
 
 
 def _divide_side(lobe, x):