Add elphy test file

Author: sprenger

neo/io/__init__.py

@@ -281,7 +281,7 @@
 from neo.io.brainwaresrcio import BrainwareSrcIO
 from neo.io.cedio import CedIO
 from neo.io.elanio import ElanIO
-# from neo.io.elphyio import ElphyIO
+from neo.io.elphyio import ElphyIO
 from neo.io.exampleio import ExampleIO
 from neo.io.igorproio import IgorIO
 from neo.io.intanio import IntanIO

neo/io/elphyio.py

@@ -87,8 +87,7 @@
 from neo.io.baseio import BaseIO
 
 # to import from core
-from neo.core import (Block, Segment,
-                      AnalogSignal, Event, SpikeTrain)
+from neo.core import (Block, Segment, AnalogSignal, Event, SpikeTrain)
 
 
 # --------------------------------------------------------
@@ -562,7 +561,7 @@ def get_protocol_and_version(self):
 
     def get_title(self):
         title_length, title = struct.unpack('<B20s', self.file.read(21))
-        return unicode(title[0:title_length])
+        return str(title[0:title_length])
 
     def get_user_file_info(self):
         header = dict()
@@ -674,7 +673,7 @@ def get_title(self):
         title_length = read_from_char(self.file, 'B')
         title, = struct.unpack('<%ss' % title_length, self.file.read(title_length))
         self.file.seek(self.file.tell() + 255 - title_length)
-        return unicode(title)
+        return str(title)
 
     def get_user_file_info(self):
         header = dict()
@@ -1858,7 +1857,7 @@ def create_bit_mask(self, ep, ch):
         for _ch in ch_mask:
             size = self.sample_size(ep, _ch)
             val = 1 if _ch == ch else 0
-            for _ in xrange(0, size):
+            for _ in np.arange(0, size):
                 _mask.append(val)
         return np.array(_mask)
 
@@ -1899,7 +1898,7 @@ def reshape_bytes(self, databytes, reshape, datatypes, order='<'):
         # create the mask for each shape
         shape_mask = list()
         for shape in reshape:
-            for _ in xrange(1, shape + 1):
+            for _ in np.arange(1, shape + 1):
                 shape_mask.append(shape)
 
         # create a set of masks to extract data

neo/test/iotest/test_elphyio.py

@@ -0,0 +1,30 @@
+"""
+Tests of neo.io.elphyo
+"""
+
+import unittest
+
+from neo.io import ElphyIO
+from neo.test.iotest.common_io_test import BaseTestIO
+
+
+
+class TestElanIO(BaseTestIO, unittest.TestCase):
+    ioclass = ElphyIO
+    files_to_test = ['DATA1.DAT', 'ElphyExample.DAT',
+                         'ElphyExample_Mode1.dat', 'ElphyExample_Mode2.dat',
+                         'ElphyExample_Mode3.dat']
+    files_to_download = ['DATA1.DAT', 'ElphyExample.DAT',
+                         'ElphyExample_Mode1.dat', 'ElphyExample_Mode2.dat',
+                         'ElphyExample_Mode3.dat']
+
+    def test_read_data(self):
+        io = ElphyIO(self.get_filename_path('DATA1.DAT'))
+        bl = io.read_block()
+
+        print(bl)
+
+
+
+if __name__ == "__main__":
+    unittest.main()