From 032b8d65892f2718fffff76b0b181babf8ee897d Mon Sep 17 00:00:00 2001 From: dengemann Date: Mon, 17 Feb 2014 15:19:25 +0100 Subject: [PATCH] allow for colon in epochs keys --- mne/event.py | 7 ++++--- mne/tests/test_epochs.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mne/event.py b/mne/event.py index 927e3e2c5a5..d07482929f1 100644 --- 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 index 9ebf1007fb0..7547b273fa9 100644 --- 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)