flake fixes

Author: pmolfese

mffpy/header_block/header_block.py

@@ -142,7 +142,7 @@ def encode_rate_depth(rate: int, depth: int) -> int:
         assert depth < (
             1 << 8), f"depth must be smaller than 256 (got {depth})"
         assert rate < (
-            1 << 24), f"depth must be smaller than {1<<24} (got {rate})"
+            1 << 24), f"depth must be smaller than {1 << 24} (got {rate})"
         return (rate << 8) + depth
 
     @staticmethod

mffpy/reader.py

@@ -250,7 +250,7 @@ def get_physical_samples(self, t0: float = 0.0, dt: Optional[float] = None,
                              channels: Optional[List[str]] = None,
                              block_slice: Optional[slice] = None
                              ) -> Dict[str, Tuple[np.ndarray, float]]:
-        """return signal data in the range `(t0, t0+dt)` in seconds from `channels`
+        """return signal data in range `(t0, t0+dt)` seconds from `channels`
 
         Use `get_physical_samples_from_epoch` instead."""
         if channels is None:

mffpy/tests/test_xml_files.py

@@ -139,7 +139,7 @@ def test_from_file(lxml_only):
     filepath = join(examples_path, 'example_5.mff', 'categories.xml')
     assert exists(filepath), f"Not found: '{filepath}'"
     output = XML.from_file(filepath)
-    assert type(output) == type(XML)._tag_registry['categories']
+    assert isinstance(output, type(XML)._tag_registry['categories'])
     expected_names = ['Category A_', 'Category B_', 'Category C_']
     category_names = sorted(output.categories.keys())
     assert category_names == expected_names
@@ -446,7 +446,7 @@ def test_EventTrack_to_xml():
     xml_stream.seek(0)
     # read the .xml and test content
     output = XML.from_file(xml_stream)
-    assert type(output) == type(XML)._tag_registry['eventTrack']
+    assert isinstance(output, type(XML)._tag_registry['eventTrack'])
     assert output.name == name
     assert output.trackType == trackType
     assert len(output.events) == len(events)
@@ -550,7 +550,7 @@ def test_Categories_to_xml(channel_status):
     xml_stream.seek(0)
     # read the .xml and test content
     output = XML.from_file(xml_stream)
-    assert type(output) == type(XML)._tag_registry['categories']
+    assert isinstance(output, type(XML)._tag_registry['categories'])
     categories = output.categories
     for name, category in categories.items():
         expected_category = expected_categories[name]
@@ -664,7 +664,7 @@ def test_history_to_xml():
               xml_declaration=True, method='xml')
     xml_stream.seek(0)
     output = XML.from_file(xml_stream)
-    assert type(output) == type(XML)._tag_registry['historyEntries']
+    assert isinstance(output, type(XML)._tag_registry['historyEntries'])
     assert len(output) == len(entries)
     for entry, expected in zip(entries, output.entries):
         assert entry == expected

mffpy/xml_files.py

@@ -41,6 +41,8 @@ def set_backend(backend: str) -> None:
                 "backend. Install it with: pip install defusedxml"
             )
     _xml_backend = backend
+
+
 """
 Copyright 2019 Brain Electrophysiology Laboratory Company LLC
 
@@ -1325,9 +1327,10 @@ def dipoles(self) -> Dict[str, np.ndarray]:
 
         # check that all dipole attributes have same lengths and 3 components
         shp = (len(dipole_tags), 3)
-        assert all(v.shape == shp for v in d_arrays.values()), f"""
-        Parsing dipoles result in broken shape.  Found {[(k, v.shape) for k, v
-        in d_arrays.items()]}"""
+        shapes = [(k, v.shape) for k, v in d_arrays.items()]
+        assert all(v.shape == shp for v in d_arrays.values()), (
+            f"Parsing dipoles result in broken shape.  Found {shapes}"
+        )
         return d_arrays
 
     def get_content(self):