BUG: Add CR-LF hash (#5942)

larsoner · massich · commit 12a85495333e · 2019-02-14T15:13:13.000+01:00
The files have different line endings, on Windows they are CR-LF and on Unix LF
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -75,6 +75,8 @@ Bug
 
 - Fix :meth:`mne.io.Raw.append` annotations miss-alignment  by `Joan Massich`_
 
+- Fix hash bug in the ``mne.io.edf`` module when installing on Windows by `Eric Larson`_
+
 - Fix :func:`mne.io.read_raw_edf` reading duplicate channel names by `Larry Eisenman`_
 
 - Fix :func:`set_bipolar_reference` in the case of generating all bipolar combinations and also in the case of repeated channels in both lists (anode and cathode) by `Cristóbal Moënne-Loccoz`_
diff --git a/mne/io/edf/_utils.py b/mne/io/edf/_utils.py
@@ -9,12 +9,18 @@
 #
 # License: BSD (3-clause)
 
+import os.path as op
 import re
+
 from ...utils import hashfunc
 
 
-def _load_gdf_events_lut(fname, md5):
-    if hashfunc(fname, hash_type='md5') != md5:
+def _load_gdf_events_lut():
+    fname = op.join(op.dirname(__file__), 'gdf_encodes.txt')
+    hash_ = hashfunc(fname, hash_type='md5')
+    # Linux or Windows line endings
+    if hash_ not in ('12134a9be7e0bfa5941e95f8bfd330f7',
+                     '41696b162526f559dd7d139352eae178'):
         raise ValueError("File %s is corrupted. mdf5 hashes don't match." %
                          fname)
 
diff --git a/mne/io/edf/edf.py b/mne/io/edf/edf.py
@@ -16,7 +16,6 @@
 import re
 
 import numpy as np
-import os.path as op
 
 from ...utils import verbose, logger, warn
 from ..utils import _blk_read_lims
@@ -29,9 +28,7 @@
 from ._utils import _load_gdf_events_lut
 
 
-GDF_EVENT_ENCODES_FILE = op.join(op.dirname(__file__), 'gdf_encodes.txt')
-GDF_EVENTS_LUT = _load_gdf_events_lut(fname=GDF_EVENT_ENCODES_FILE,
-                                      md5='12134a9be7e0bfa5941e95f8bfd330f7')
+GDF_EVENTS_LUT = _load_gdf_events_lut()
 
 
 @deprecated('find_edf_events is deprecated in 0.18, and will be removed'
