Skip to content

Commit 3d085ce

Browse files
author
kleinjohann
committed
pep8
1 parent 7ffcbea commit 3d085ce

File tree

1 file changed

+22
-26
lines changed

1 file changed

+22
-26
lines changed

neo/test/iotest/test_nixio.py

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def compare_attr(self, neoobj, nixobj):
326326
nixvalue = np.array(nixvalue)
327327
np.testing.assert_almost_equal(nixvalue, v.magnitude)
328328
if isinstance(v, np.ndarray):
329-
self.assertTrue(np.all(v==nixmd[str(k)]))
329+
self.assertTrue(np.all(v == nixmd[str(k)]))
330330
else:
331331
self.assertEqual(nixmd[str(k)], v,
332332
"Property value mismatch: {}".format(k))
@@ -1408,54 +1408,50 @@ def test_array_annotations_read(self):
14081408
nix_block = self.nixfile.blocks[bl.annotations['nix_name']]
14091409
for seg in bl.segments:
14101410
for anasig in seg.analogsignals:
1411-
da = nix_block.data_arrays[anasig.annotations['nix_name']+'.0']
1411+
da = nix_block.data_arrays[anasig.annotations['nix_name'] + '.0']
14121412
self.assertIn('anasig_arr_ann', da.metadata)
14131413
self.assertIn('anasig_arr_ann', anasig.array_annotations)
1414-
self.assertTrue(np.all(da.metadata['anasig_arr_ann'] ==
1415-
anasig.array_annotations['anasig_arr_ann'].magnitude))
1414+
nix_ann = da.metadata['anasig_arr_ann']
1415+
neo_ann = anasig.array_annotations['anasig_arr_ann']
1416+
self.assertTrue(np.all(nix_ann == neo_ann.magnitude))
14161417
self.assertEqual(da.metadata.props['anasig_arr_ann'].unit,
1417-
units_to_string(
1418-
anasig.array_annotations['anasig_arr_ann'].units))
1418+
units_to_string(neo_ann.units))
14191419
for irrsig in seg.irregularlysampledsignals:
14201420
da = nix_block.data_arrays[irrsig.annotations['nix_name'] + '.0']
14211421
self.assertIn('irrsig_arr_ann', da.metadata)
14221422
self.assertIn('irrsig_arr_ann', irrsig.array_annotations)
1423-
self.assertTrue(np.all(da.metadata['irrsig_arr_ann'] ==
1424-
irrsig.array_annotations[
1425-
'irrsig_arr_ann'].magnitude))
1423+
nix_ann = da.metadata['irrsig_arr_ann']
1424+
neo_ann = irrsig.array_annotations['irrsig_arr_ann']
1425+
self.assertTrue(np.all(nix_ann == neo_ann.magnitude))
14261426
self.assertEqual(da.metadata.props['irrsig_arr_ann'].unit,
1427-
units_to_string(
1428-
irrsig.array_annotations['irrsig_arr_ann'].units))
1427+
units_to_string(neo_ann.units))
14291428
for ev in seg.events:
14301429
da = nix_block.multi_tags[ev.annotations['nix_name']]
14311430
self.assertIn('ev_arr_ann', da.metadata)
14321431
self.assertIn('ev_arr_ann', ev.array_annotations)
1433-
self.assertTrue(np.all(da.metadata['ev_arr_ann'] ==
1434-
ev.array_annotations[
1435-
'ev_arr_ann'].magnitude))
1432+
nix_ann = da.metadata['ev_arr_ann']
1433+
neo_ann = ev.array_annotations['ev_arr_ann']
1434+
self.assertTrue(np.all(nix_ann == neo_ann.magnitude))
14361435
self.assertEqual(da.metadata.props['ev_arr_ann'].unit,
1437-
units_to_string(
1438-
ev.array_annotations['ev_arr_ann'].units))
1436+
units_to_string(neo_ann.units))
14391437
for ep in seg.epochs:
14401438
da = nix_block.multi_tags[ep.annotations['nix_name']]
14411439
self.assertIn('ep_arr_ann', da.metadata)
14421440
self.assertIn('ep_arr_ann', ep.array_annotations)
1443-
self.assertTrue(np.all(da.metadata['ep_arr_ann'] ==
1444-
ep.array_annotations[
1445-
'ep_arr_ann'].magnitude))
1441+
nix_ann = da.metadata['ep_arr_ann']
1442+
neo_ann = ep.array_annotations['ep_arr_ann']
1443+
self.assertTrue(np.all(nix_ann == neo_ann.magnitude))
14461444
self.assertEqual(da.metadata.props['ep_arr_ann'].unit,
1447-
units_to_string(
1448-
ep.array_annotations['ep_arr_ann'].units))
1445+
units_to_string(neo_ann.units))
14491446
for st in seg.spiketrains:
14501447
da = nix_block.multi_tags[st.annotations['nix_name']]
14511448
self.assertIn('st_arr_ann', da.metadata)
14521449
self.assertIn('st_arr_ann', st.array_annotations)
1453-
self.assertTrue(np.all(da.metadata['st_arr_ann'] ==
1454-
st.array_annotations[
1455-
'st_arr_ann'].magnitude))
1450+
nix_ann = da.metadata['st_arr_ann']
1451+
neo_ann = st.array_annotations['st_arr_ann']
1452+
self.assertTrue(np.all(nix_ann == neo_ann.magnitude))
14561453
self.assertEqual(da.metadata.props['st_arr_ann'].unit,
1457-
units_to_string(
1458-
st.array_annotations['st_arr_ann'].units))
1454+
units_to_string(neo_ann.units))
14591455

14601456

14611457
@unittest.skipUnless(HAVE_NIX, "Requires NIX")

0 commit comments

Comments
 (0)