Merge 032b8d6 into a470847

mne-tools · Feb 17, 2014 · f1f8c2c · f1f8c2c
2 parents a470847 + 032b8d6
commit f1f8c2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/mne/event.py b/mne/event.py
@@ -167,9 +167,10 @@ def _read_events_fif(fid, tree):
     else:
         mappings = None
 
-    if mappings is not None:
-        m_ = (m.split(':') for m in mappings.split(';'))
-        mappings = dict((k, int(v)) for k, v in m_)
+    if mappings is not None:  # deal with ':' in keys
+        m_ = [[s[::-1] for s in m[::-1].split(':', 1)]
+              for m in mappings.split(';')]
+        mappings = dict((k, int(v)) for v, k in m_)
     event_list = event_list.reshape(len(event_list) // 3, 3)
     return event_list, mappings
 

diff --git a/mne/tests/test_epochs.py b/mne/tests/test_epochs.py
@@ -145,7 +145,7 @@ def test_read_write_epochs():
     assert_equal(epochs_read.event_id, epochs.event_id)
 
     epochs.event_id.pop('1')
-    epochs.event_id.update({'a': 1})
+    epochs.event_id.update({'a:a': 1})  # test allow for ':' in key
     epochs.save(op.join(tempdir, 'foo-epo.fif'))
     epochs_read2 = read_epochs(op.join(tempdir, 'foo-epo.fif'))
     assert_equal(epochs_read2.event_id, epochs.event_id)