Pep8 fixes

Author: JuliaSprenger

neo/core/analogsignal.py

@@ -714,7 +714,8 @@ def concatenate(self, *signals, overwrite=False, padding=False):
         units, sr, shape = attribute_values[0]
 
         # find gaps between Analogsignals
-        combined_time_ranges = self._concatenate_time_ranges([(s.t_start, s.t_stop) for s in signals])
+        combined_time_ranges = self._concatenate_time_ranges(
+            [(s.t_start, s.t_stop) for s in signals])
         missing_time_ranges = self._invert_time_ranges(combined_time_ranges)
         if len(missing_time_ranges):
             diffs = np.diff(np.asarray(missing_time_ranges), axis=1)
@@ -759,7 +760,7 @@ def concatenate(self, *signals, overwrite=False, padding=False):
                 kwargs[name] = f'concatenation ({attr})'
 
         conc_signal = AnalogSignal(np.full(shape=shape, fill_value=padding, dtype=signals[0].dtype),
-                                   sampling_rate=sr,  t_start=t_start,  units=units, **kwargs)
+                                   sampling_rate=sr, t_start=t_start, units=units, **kwargs)
 
         if not overwrite:
             signals = signals[::-1]
@@ -783,10 +784,7 @@ def _concatenate_time_ranges(self, time_ranges):
     def _invert_time_ranges(self, time_ranges):
         i = 0
         new_ranges = []
-        while i < len(time_ranges)-1:
-            new_ranges.append((time_ranges[i][1], time_ranges[i+1][0]))
+        while i < len(time_ranges) - 1:
+            new_ranges.append((time_ranges[i][1], time_ranges[i + 1][0]))
             i += 1
         return new_ranges
-
-
-

neo/core/baseneo.py

@@ -109,6 +109,7 @@ def merge_annotations(A, *Bs):
     logger.debug("Merging annotations: A=%s Bs=%s merged=%s", A, Bs, merged)
     return merged
 
+
 def intersect_annotations(A, B):
     """
     Identify common entries in dictionaries A and B

neo/test/coretest/test_analogsignal.py

@@ -370,18 +370,17 @@ def test__repr(self):
     def test__pretty(self):
         for i, signal in enumerate(self.signals):
             prepr = pretty(signal)
-            targ = (
-                    ('AnalogSignal with %d channels of length %d; units %s; datatype %s \n'
+            targ = (('AnalogSignal with %d channels of length %d; units %s; datatype %s \n'
                      '' % (signal.shape[1], signal.shape[0],
                            signal.units.dimensionality.unicode, signal.dtype))
                     + ('annotations: %s\n' % signal.annotations)
-                    + ('sampling rate: {} {}\n'.format(float(signal.sampling_rate),
-                                                       signal.sampling_rate.dimensionality.unicode))
+                    + ('sampling rate: {} {}\n'.format(
+                        float(signal.sampling_rate),
+                        signal.sampling_rate.dimensionality.unicode))
                     + ('time: {} {} to {} {}'.format(float(signal.t_start),
                                                      signal.t_start.dimensionality.unicode,
                                                      float(signal.t_stop),
-                                                     signal.t_stop.dimensionality.unicode))
-            )
+                                                     signal.t_stop.dimensionality.unicode)))
             self.assertEqual(prepr, targ)
 
 
@@ -1648,8 +1647,9 @@ def test_concatenate_padding_True(self):
                                t_start=signal1.t_stop + 3 * signal1.sampling_period)
 
         result = signal1.concatenate(signal2, overwrite=False, padding=True)
-        assert_array_equal(np.array([0, 1, 2, 3, np.NaN, np.NaN, np.NaN, 4, 5, 6]).reshape((-1, 1)),
-                           result.magnitude)
+        assert_array_equal(
+            np.array([0, 1, 2, 3, np.NaN, np.NaN, np.NaN, 4, 5, 6]).reshape((-1, 1)),
+            result.magnitude)
 
     def test_concatenate_padding_quantity(self):
         signal1 = AnalogSignal([0, 1, 2, 3] * pq.V, sampling_rate=1 * pq.Hz)

neo/test/coretest/test_irregularysampledsignal.py

@@ -239,12 +239,10 @@ def test_IrregularlySampledSignal_repr(self):
         if np.__version__.split(".")[:2] > ['1', '13']:
             # see https://github.com/numpy/numpy/blob/master/doc/release/1.14.0-notes.rst#many
             # -changes-to-array-printing-disableable-with-the-new-legacy-printing-mode
-            targ = (
-                    '<IrregularlySampledSignal(array([[2.],\n       [4.],\n       [6.]]) * V '
+            targ = ('<IrregularlySampledSignal(array([[2.],\n       [4.],\n       [6.]]) * V '
                     '' + 'at times [1.1 1.5 1.7] s)>')
         else:
-            targ = (
-                    '<IrregularlySampledSignal(array([[ 2.],\n       [ 4.],\n       [ 6.]]) '
+            targ = ('<IrregularlySampledSignal(array([[ 2.],\n       [ 4.],\n       [ 6.]]) '
                     '* V ' + 'at times [ 1.1  1.5  1.7] s)>')
         res = repr(sig)
         self.assertEqual(targ, res)
@@ -946,7 +944,8 @@ def test__merge(self):
         self.assertRaises(MergeError, signal1.merge, signal3)
 
     def test_concatenate_simple(self):
-        signal1 = IrregularlySampledSignal(signal=[0, 1, 2, 3] * pq.s, times=[1, 10, 11, 14] * pq.s)
+        signal1 = IrregularlySampledSignal(signal=[0, 1, 2, 3] * pq.s,
+                                           times=[1, 10, 11, 14] * pq.s)
         signal2 = IrregularlySampledSignal(signal=[4, 5, 6] * pq.s, times=[15, 16, 21] * pq.s)
 
         result = signal1.concatenate(signal2)
@@ -977,8 +976,8 @@ def test_concatenate_overlap(self):
         signal2 = IrregularlySampledSignal(signal=[4, 5, 6] * pq.s, times=range(2, 5) * pq.s)
 
         result = signal1.concatenate(signal2, allow_overlap=True)
-        assert_array_equal(np.array([0,1,2,4,3,5,6]).reshape((-1, 1)), result.magnitude)
-        assert_array_equal(np.array([0,1,2,2,3,3,4]), result.times)
+        assert_array_equal(np.array([0, 1, 2, 4, 3, 5, 6]).reshape((-1, 1)), result.magnitude)
+        assert_array_equal(np.array([0, 1, 2, 2, 3, 3, 4]), result.times)
 
     def test_concatenate_multi_trace(self):
         data1 = np.arange(4).reshape(2, 2)