Merge branch 'rm-3.4' of https://github.com/hugovk/python-neo into hugovk-rm-3.4

# Conflicts:
#	doc/source/developers_guide.rst
#	neo/test/coretest/test_analogsignalarray.py

Author: apdavison

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 

doc/source/developers_guide.rst

@@ -3,7 +3,7 @@ Developers' guide
 =================
 
 These instructions are for developing on a Unix-like platform, e.g. Linux or
-Mac OS X, with the bash shell. If you develop on Windows, please get in touch.
+macOS, with the bash shell. If you develop on Windows, please get in touch.
 
 
 Mailing lists
@@ -38,7 +38,7 @@ a GitHub account and then set to watch the repository at `GitHub Repository`_
 Requirements
 ------------
 
-    * Python_ 2.7, 3.4 or later
+    * Python_ 2.7, 3.5 or later
     * numpy_ >= 1.10.0
     * quantities_ >= 0.12.1
     * nose_ >= 1.1.2 (for running tests)
@@ -64,7 +64,7 @@ To get a local copy of the repository::
 
     $ cd /some/directory
     $ git clone [email protected]:<username>/python-neo.git
-
+    
 Now you need to make sure that the ``neo`` package is on your PYTHONPATH.
 You can do this either by installing Neo::
 
@@ -200,7 +200,7 @@ open a pull request on GitHub
 Python version
 --------------
 
-Neo core should work with both Python 2.7 and Python 3 (version 3.4 or newer).
+Neo core should work with both Python 2.7 and Python 3 (version 3.5 or newer).
 Neo IO modules should ideally work with both Python 2 and 3, but certain
 modules may only work with one or the other (see :doc:`install`).
 
@@ -223,7 +223,7 @@ Coding standards and style
 --------------------------
 
 All code should conform as much as possible to `PEP 8`_, and should run with
-Python 2.7, and 3.4 or newer.
+Python 2.7, and 3.5 or newer.
 
 You can use the `pep8`_ program to check the code for PEP 8 conformity.
 You can also use `flake8`_, which combines pep8 and pyflakes.
@@ -264,7 +264,7 @@ Michael Denker and Julia Sprenger have the necessary permissions to do this)::
 
 .. talk about readthedocs
 
-
+    
 
 .. make a release branch
 
@@ -279,7 +279,6 @@ See :ref:`io_dev_guide` for implementation of a new IO.
 
 .. _Python: http://www.python.org
 .. _nose: http://somethingaboutorange.com/mrl/projects/nose/
-.. _unittest2: http://pypi.python.org/pypi/unittest2
 .. _Setuptools: https://pypi.python.org/pypi/setuptools/
 .. _tox: http://codespeak.net/tox/
 .. _coverage: http://nedbatchelder.com/code/coverage/

neo/core/analogsignal.py

@@ -440,8 +440,8 @@ def _pp(line):
             with pp.group(indent=1):
                 pp.text(line)
 
-        for line in ["sampling rate: {0}".format(self.sampling_rate),
-                     "time: {0} to {1}".format(self.t_start, self.t_stop)]:
+        for line in ["sampling rate: {}".format(self.sampling_rate),
+                     "time: {} to {}".format(self.t_start, self.t_stop)]:
             _pp(line)
 
     def time_index(self, t):

neo/core/baseneo.py

@@ -72,7 +72,7 @@ def merge_annotation(a, b):
         For strings: concatenate with ';'
         Otherwise: fail if the annotations are not equal
     """
-    assert type(a) == type(b), 'type(%s) %s != type(%s) %s' % (a, type(a),
+    assert type(a) == type(b), 'type({}) {} != type({}) {}'.format(a, type(a),
                                                                b, type(b))
     if isinstance(a, dict):
         return merge_annotations(a, b)
@@ -86,7 +86,7 @@ def merge_annotation(a, b):
         else:
             return a + ";" + b
     else:
-        assert a == b, '%s != %s' % (a, b)
+        assert a == b, '{} != {}'.format(a, b)
         return a
 
 
@@ -308,7 +308,7 @@ def _repr_pretty_attrs_(self, pp, cycle):
                 else:
                     pp.breakable()
                 with pp.group(indent=1):
-                    pp.text("{0}: ".format(key))
+                    pp.text("{}: ".format(key))
                     pp.pretty(value)
 
     def _repr_pretty_(self, pp, cycle):

neo/core/basesignal.py

@@ -264,7 +264,7 @@ def merge(self, other):
             if attr_self == attr_other:
                 kwargs[name] = attr_self
             else:
-                kwargs[name] = "merge(%s, %s)" % (attr_self, attr_other)
+                kwargs[name] = "merge({}, {})".format(attr_self, attr_other)
         merged_annotations = merge_annotations(self.annotations, other.annotations)
         kwargs.update(merged_annotations)
 

neo/core/channelindex.py

@@ -22,12 +22,12 @@ class ChannelIndex(Container):
 
     This container has several purposes:
 
-      * Grouping all :class:`AnalogSignal`\s and
-        :class:`IrregularlySampledSignal`\s inside a :class:`Block` across
-        :class:`Segment`\s;
+      * Grouping all :class:`AnalogSignal`\\s and
+        :class:`IrregularlySampledSignal`\\s inside a :class:`Block` across
+        :class:`Segment`\\s;
       * Indexing a subset of the channels within an :class:`AnalogSignal` and
-        :class:`IrregularlySampledSignal`\s;
-      * Container of :class:`Unit`\s. Discharges of multiple neurons
+        :class:`IrregularlySampledSignal`\\s;
+      * Container of :class:`Unit`\\s. Discharges of multiple neurons
         (:class:`Unit`\'s) can be seen on the same channel.
 
     *Usage 1* providing channel IDs across multiple :class:`Segment`::

neo/core/container.py

@@ -374,8 +374,8 @@ def size(self):
         Get dictionary containing the names of child containers in the current
         object as keys and the number of children of that type as values.
         """
-        return dict((name, len(getattr(self, name)))
-                    for name in self._child_containers)
+        return {name: len(getattr(self, name))
+                    for name in self._child_containers}
 
     def filter(self, targdict=None, data=True, container=False, recursive=True,
                objects=None, **kwargs):
@@ -569,7 +569,7 @@ def merge(self, other):
         # merge containers with the same name
         for container in (self._container_child_containers +
                               self._multi_child_containers):
-            lookup = dict((obj.name, obj) for obj in getattr(self, container))
+            lookup = {obj.name: obj for obj in getattr(self, container)}
             ids = [id(obj) for obj in getattr(self, container)]
             for obj in getattr(other, container):
                 if id(obj) in ids:
@@ -584,7 +584,7 @@ def merge(self, other):
         # for data objects, ignore the name and just add them
         for container in self._data_child_containers:
             objs = getattr(self, container)
-            lookup = dict((obj.name, i) for i, obj in enumerate(objs))
+            lookup = {obj.name: i for i, obj in enumerate(objs)}
             ids = [id(obj) for obj in objs]
             for obj in getattr(other, container):
                 if id(obj) in ids:
@@ -617,7 +617,7 @@ def _repr_pretty_(self, pp, cycle):
         for container in self._child_containers:
             objs = getattr(self, container)
             if objs:
-                vals.append('%s %s' % (len(objs), container))
+                vals.append('{} {}'.format(len(objs), container))
         pp.text(', '.join(vals))
 
         if self._has_repr_pretty_attrs_():
@@ -627,7 +627,7 @@ def _repr_pretty_(self, pp, cycle):
         for container in self._repr_pretty_containers:
             pp.breakable()
             objs = getattr(self, container)
-            pp.text("# %s (N=%s)" % (container, len(objs)))
+            pp.text("# {} (N={})".format(container, len(objs)))
             for (i, obj) in enumerate(objs):
                 pp.breakable()
                 pp.text("%s: " % i)

neo/core/epoch.py

@@ -248,7 +248,7 @@ def merge(self, other):
             if attr_self == attr_other:
                 kwargs[name] = attr_self
             else:
-                kwargs[name] = "merge(%s, %s)" % (attr_self, attr_other)
+                kwargs[name] = "merge({}, {})".format(attr_self, attr_other)
 
         merged_annotations = merge_annotations(self.annotations, other.annotations)
         kwargs.update(merged_annotations)

neo/core/event.py

@@ -106,7 +106,7 @@ def __new__(cls, times=None, labels=None, units=None, name=None, description=Non
         # reference dimensionality
         if (len(dim) != 1 or list(dim.values())[0] != 1 or not isinstance(list(dim.keys())[0],
                                                                           pq.UnitTime)):
-            ValueError("Unit %s has dimensions %s, not [time]" % (units, dim.simplified))
+            ValueError("Unit {} has dimensions {}, not [time]".format(units, dim.simplified))
 
         obj = pq.Quantity(times, units=dim).view(cls)
         obj._labels = labels
@@ -192,7 +192,7 @@ def merge(self, other):
             if attr_self == attr_other:
                 kwargs[name] = attr_self
             else:
-                kwargs[name] = "merge(%s, %s)" % (attr_self, attr_other)
+                kwargs[name] = "merge({}, {})".format(attr_self, attr_other)
 
         print('Event: merge annotations')
         merged_annotations = merge_annotations(self.annotations, other.annotations)

neo/core/irregularlysampledsignal.py

@@ -191,7 +191,7 @@ def __repr__(self):
         '''
         Returns a string representing the :class:`IrregularlySampledSignal`.
         '''
-        return '<%s(%s at times %s)>' % (
+        return '<{}({} at times {})>'.format(
             self.__class__.__name__, super(IrregularlySampledSignal, self).__repr__(), self.times)
 
     def __getitem__(self, i):
@@ -285,15 +285,16 @@ def _check_consistency(self, other):
             return
         # dimensionality should match
         if self.ndim != other.ndim:
-            raise ValueError('Dimensionality does not match: %s vs %s' % (self.ndim, other.ndim))
+            raise ValueError('Dimensionality does not match: {} vs {}'.format(
+                self.ndim, other.ndim))
         # if if the other array does not have a times property,
         # then it should be okay to add it directly
         if not hasattr(other, 'times'):
             return
 
         # if there is a times property, the times need to be the same
         if not (self.times == other.times).all():
-            raise ValueError('Times do not match: %s vs %s' % (self.times, other.times))
+            raise ValueError('Times do not match: {} vs {}'.format(self.times, other.times))
 
     def __rsub__(self, other, *args):
         '''
@@ -320,7 +321,7 @@ def _pp(line):
             with pp.group(indent=1):
                 pp.text(line)
 
-        for line in ["sample times: {0}".format(self.times)]:
+        for line in ["sample times: {}".format(self.times)]:
             _pp(line)
 
     @property
@@ -453,7 +454,7 @@ def merge(self, other):
             if attr_self == attr_other:
                 kwargs[name] = attr_self
             else:
-                kwargs[name] = "merge(%s, %s)" % (attr_self, attr_other)
+                kwargs[name] = "merge({}, {})".format(attr_self, attr_other)
         merged_annotations = merge_annotations(self.annotations, other.annotations)
         kwargs.update(merged_annotations)