revert changes from 3fb86c6 in favor of the opposite solution (+ minor changes)

afvincent · afvincent · commit fc212ee0b2f6 · 2017-03-06T21:32:07.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1132,7 +1132,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         linestyles : str or tuple or a sequence of such values, optional.
             Default is 'solid'. Valid strings are [ 'solid' | 'dashed' |
             'dashdot' | 'dotted' | '-' | '--' | '-.' | ':' ]. Dash tuples
-            have to follow::
+            have to be of the form::
 
                 (offset, onoffseq),
 
@@ -1169,9 +1169,6 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         lineoffsets = self.convert_yunits(lineoffsets)
         linelengths = self.convert_yunits(linelengths)
 
-        if positions is None:
-            positions = []
-
         if not iterable(positions):
             positions = [positions]
         elif any(iterable(position) for position in positions):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1251,7 +1251,7 @@ class EventCollection(LineCollection):
     _edge_default = True
 
     def __init__(self,
-                 positions,     # Can be None.
+                 positions,     # Cannot be None.
                  orientation=None,
                  lineoffset=0,
                  linelength=1,
@@ -1264,7 +1264,7 @@ def __init__(self,
         """
         Parameters
         ----------
-        positions : 1D array-like object or None.
+        positions : 1D array-like object.
             Each value is an event.
 
         orientation : [ None (default) | 'horizontal' | 'vertical'], optional.
@@ -1286,9 +1286,8 @@ def __init__(self,
             If it is None, defaults to its rcParams setting, in sequence form.
 
         linestyle : str or tuple, optional. Default is 'solid'.
-            If it is a string, it has to be among [ 'solid' | 'dashed' |
-            'dashdot' | 'dotted' | '-' | '--' | '-.' | ':' ]. If it is a dash
-            tuple, it has to be of the form::
+            Valid strings are [ 'solid' | 'dashed' | 'dashdot' | 'dotted' |
+            '-' | '--' | '-.' | ':' ]. Dash tuples have to be of the form::
 
                 (offset, onoffseq),
 
@@ -1311,11 +1310,12 @@ def __init__(self,
 
         segment = (lineoffset + linelength / 2.,
                    lineoffset - linelength / 2.)
-        if positions is None or len(positions) == 0:
+        positions = np.asarray(positions)
+        if len(positions) == 0:
             segments = []
-        elif hasattr(positions, 'ndim') and positions.ndim > 1:
-            raise ValueError('if positions is an ndarray it cannot have '
-                             'dimensionality strictly greater than 1 ')
+        elif positions.ndim > 1:
+            raise ValueError('positions cannot have a dimensionality greater '
+                             'than 1 (in the ndarray sense)')
         elif (orientation is None or orientation.lower() == 'none' or
               orientation.lower() == 'horizontal'):
             positions.sort()
