Skip to content

Fix Python3 issue in BlackrockIO #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2018
Merged

Fix Python3 issue in BlackrockIO #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3801df9
Fixed a string to be 'b' so that the decode() function works in Python3
mdenker Nov 15, 2018
05d47fa
Fixed a spelling mistake in the test doku
mdenker Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion neo/io/blackrockio_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ def __get_nsx_param_variant_a(self, param_name, nsx_nb):
nsx_parameters = {
'labels': labels,
'units': np.array(
['uV'] *
[b'uV'] *
self.__nsx_basic_header[nsx_nb]['channel_count']),
'min_analog_val': -1 * np.array(dig_factor),
'max_analog_val': np.array(dig_factor),
Expand Down
2 changes: 1 addition & 1 deletion neo/test/iotest/test_blackrockio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def test_load_muliple_nsx(self):
@unittest.skipUnless(HAVE_SCIPY, "requires scipy")
def test_compare_blackrockio_with_matlabloader_v21(self):
"""
This test compares the output of ReachGraspIO.read_block() with the
This test compares the output of BlackrockIO.read_block() with the
output generated by a Matlab implementation of a Blackrock file reader
provided by the company. The output for comparison is provided in a
.mat file created by the script create_data_matlab_blackrock.m.
Expand Down