Check diff with respect to the original PR

rth · rth · commit a48d365c749c · 2018-07-05T20:43:48.000+02:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -141,8 +141,7 @@ def set_3d_properties(self, zs=0, zdir='z'):
         xs = self.get_xdata()
         ys = self.get_ydata()
 
-        if not cbook.iterable(zs):
-            zs = np.ones(len(xs)) * zs
+	zs = np.broadcast_to(zs, len(xs))
         xyz = np.asarray([xs, ys, zs])
         self._verts3d = juggle_axes_vec(xyz, zdir)
         self.stale = True
@@ -170,7 +169,7 @@ def path_to_3d_segment(path, zs=0, zdir='z'):
 
     # Works either if zs is array or scalar
     seg3d[2] *= zs
-       
+
     pathsegs = path.iter_segments(simplify=False, curves=False)
     for i, ((x, y), code) in enumerate(pathsegs):
         seg3d[0:2, i] = x, y
@@ -181,13 +180,11 @@ def path_to_3d_segment(path, zs=0, zdir='z'):
 def paths_to_3d_segments(paths, zs=0, zdir='z'):
     """Convert paths from a collection object to 3D segments."""
 
-    if not cbook.iterable(zs):
-        zs = np.ones(len(paths)) * zs
+    zs = np.broadcast_to(zs, len(paths))
 
-    segments = []
-    for path, pathz in zip(paths, zs):
-        segments.append(path_to_3d_segment(path, pathz, zdir))
-    return np.asarray(segments)
+    segs = [path_to_3d_segment(path, pathz, zdir)
+            for path, pathz in zip(paths, zs)]
+    return np.asarray(segs)
 
 
 def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
@@ -196,7 +193,7 @@ def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
     # XXX should we consider a 4d array?
     seg3d = np.ones((3, len(path)))
 
-    # Works either if zs is array or scalar
+    # Works both if zs is an array and a scalar
     seg3d[2] *= zs
 
     pathsegs = path.iter_segments(simplify=False, curves=False)
@@ -235,7 +232,7 @@ def set_sort_zpos(self, val):
 
     def set_segments(self, segments):
         """
-        Set 3D segments
+        Set 3D segments.
         """
         self._seg_sizes = [len(c) for c in segments]
         self._segments3d = []
@@ -296,7 +293,8 @@ def __init__(self, *args, zs=(), zdir='z', **kwargs):
         self.set_3d_properties(zs, zdir)
 
     def set_3d_properties(self, verts, zs=0, zdir='z'):
-        verts = np.hstack([verts, np.ones((len(verts), 1)) * zs])
+        zs = np.broadcast_to(zs, len(verts))
+        verts = np.hstack([verts, zs])
         self._segment3d = juggle_axes_vec(verts.T, zdir)
         self._facecolor3d = Patch.get_facecolor(self)
 
@@ -753,7 +751,7 @@ def juggle_axes_vec(xyz, zdir):
         return xyz[[2, 0, 1]]
     elif zdir == 'y':
         return xyz[[0, 2, 1]]
-    elif zdir[0] == '-':
+    elif zdir.startswith('-'):
         return rotate_axes_vec(xyz, zdir)
     else:
         return xyz
@@ -769,12 +767,10 @@ def rotate_axes(xs, ys, zs, zdir):
         return ys, zs, xs
     elif zdir == '-x':
         return zs, xs, ys
-
     elif zdir == 'y':
         return zs, xs, ys
     elif zdir == '-y':
         return ys, zs, xs
-
     else:
         return xs, ys, zs
 
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py
@@ -136,10 +136,10 @@ def proj_transform_vec(vec, M):
 def proj_transform_vec_clip(vec, M):
     vecw = np.dot(M, vec)
     # Determine clipping before rescaling
-    tis = (vecw[0] >= 0) * (vecw[0] <= 1) * (vecw[1] >= 0) * (vecw[1] <= 1)
+    tis = (0 <= vecw[0]) & (vecw[0] <= 1) & (0 <= vecw[1]) & (vecw[1] <= 1)
     # clip here..
     # Can anybody comment on this piece of code? I don't understand it...
-    if np.sometrue(tis):
+    if np.any(tis):
         tis = vecw[1] < 1
     vecw /= vecw[3]
     # Integrating tis in the numpy array for optimization purposes
