Remove more unused code

Author: apdavison

doc/source/images/generate_diagram.py

@@ -73,8 +73,7 @@ def generate_diagram(rect_pos, rect_width, figsize):
     alpha = [1., 1., 0.3]
     for name, pos in rect_pos.items():
         obj = objs[name]
-        relationships = [getattr(obj, '_single_child_objects', []),
-                         getattr(obj, '_child_properties', [])]
+        relationships = [getattr(obj, '_single_child_objects', [])]
 
         for r in range(3):
             for ch_name in relationships[r]:

doc/source/io_developers_guide.rst

@@ -38,7 +38,7 @@ Miscellaneous
 =============
 
     * If your IO supports several versions of a format (like ABF1, ABF2), upload to the gin.g-node.org test file repository all file versions possible. (for test coverage).
-    * :py:func:`neo.core.Block.create_many_to_one_relationship` offers a utility to complete the hierarchy when all one-to-many relationships have been created.
+    * :py:func:`neo.core.Block.create_relationship` offers a utility to complete the hierarchy when all one-to-many relationships have been created.
     * In the docstring, explain where you obtained the file format specification if it is a closed one.
     * If your IO is based on a database mapper, keep in mind that the returned object MUST be detached,
       because this object can be written to another url for copying.

neo/core/block.py

@@ -64,7 +64,6 @@ class Block(Container):
     '''
 
     _container_child_objects = ('Segment', 'Group')
-    _child_properties = ()
     _recommended_attrs = ((('file_datetime', datetime),
                            ('rec_datetime', datetime),
                            ('index', int)) +

neo/core/container.py

@@ -114,20 +114,15 @@ class Container(BaseNeo):
                               class.__name__.lower()+'s' will be automatically
                               defined to hold this child and will be
                               initialized to an empty list.
-        :_child_properties: Properties that return sub-children of a particular
-                            type.  These properties must still be defined.
-                            This is mostly used for generate_diagram.
         :_repr_pretty_containers: The names of containers attributes printed
-                                  when pretty-printing using iPython.
+                                  when pretty-printing using IPython.
 
     The following helper properties are available
     (in  addition to those of BaseNeo):
-        :_single_child_objects: All neo container objects that can be children
-                                of this object and where the child can only
-                                have one parent of this type.
+        :_child_objects: All neo container objects that can be children
+                                of this object.
                                 :_container_child_objects: +
                                 :_data_child_objects:
-        :_child_objects: All child objects. Same as :_single_child_objects:
         :_container_child_containers: The names of the container attributes
                                       used to store :_container_child_objects:
         :_data_child_containers: The names of the container attributes used
@@ -192,8 +187,6 @@ class Container(BaseNeo):
     _container_child_objects = ()
     # Child objects that have data and have a single parent
     _data_child_objects = ()
-    # Properties returning children of children [of children...]
-    _child_properties = ()
     # Containers that are listed when pretty-printing
     _repr_pretty_containers = ()
 
@@ -208,7 +201,7 @@ def __init__(self, name=None, description=None, file_origin=None,
     @property
     def _child_objects(self):
         """
-        Child objects that have a single parent.
+        Return the names of the classes that can be children of this container.
         """
         return self._container_child_objects + self._data_child_objects
 

neo/test/coretest/test_container.py

@@ -56,7 +56,6 @@ def test__children(self):
 
         self.assertEqual(container._container_child_objects, ())
         self.assertEqual(container._data_child_objects, ())
-        self.assertEqual(container._child_properties, ())
 
         self.assertEqual(container._repr_pretty_containers, ())