Merge pull request #16142 from anntzer/nprc

timhoffm · web-flow · commit a7f136e744d9 · 2020-01-08T00:44:38.000+01:00
Avoid using np.r_, np.c_.
diff --git a/examples/lines_bars_and_markers/filled_step.py b/examples/lines_bars_and_markers/filled_step.py
@@ -64,8 +64,8 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
         bottoms = 0
     bottoms = np.broadcast_to(bottoms, values.shape)
 
-    values = np.r_[values, values[-1]]
-    bottoms = np.r_[bottoms, bottoms[-1]]
+    values = np.append(values, values[-1])
+    bottoms = np.append(bottoms, bottoms[-1])
     if orientation == 'h':
         return ax.fill_betweenx(edges, values, bottoms,
                                 **kwargs)
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -331,11 +331,9 @@ def calc_label_rot_and_inline(self, slc, ind, lw, lc=None, spacing=5):
         # Check if closed and, if so, rotate contour so label is at edge
         closed = _is_closed_polygon(slc)
         if closed:
-            slc = np.r_[slc[ind:-1], slc[:ind + 1]]
-
+            slc = np.concatenate([slc[ind:-1], slc[:ind + 1]])
             if len(lc):  # Rotate lc also if not empty
-                lc = np.r_[lc[ind:-1], lc[:ind + 1]]
-
+                lc = np.concatenate([lc[ind:-1], lc[:ind + 1]])
             ind = 0
 
         # Calculate path lengths
@@ -494,7 +492,7 @@ def add_label_near(self, x, y, inline=True, inline_spacing=5,
         # if there isn't a vertex close enough
         if not np.allclose(xcmin, lc[imin]):
             # insert new data into the vertex list
-            lc = np.r_[lc[:imin], np.array(xcmin)[None, :], lc[imin:]]
+            lc = np.row_stack([lc[:imin], xcmin, lc[imin:]])
             # replace the path with the new one
             paths[segmin] = mpath.Path(lc)
 
@@ -568,7 +566,7 @@ def labels(self, inline, inline_spacing):
                 # functions, this is not necessary and should probably be
                 # eventually removed.
                 if _is_closed_polygon(lc):
-                    slc = np.r_[slc0, slc0[1:2, :]]
+                    slc = np.row_stack([slc0, slc0[1:2]])
                 else:
                     slc = slc0
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1681,7 +1681,7 @@ def test_bar_pandas_indexed(pd):
 @image_comparison(['hist_log'], remove_text=True)
 def test_hist_log():
     data0 = np.linspace(0, 1, 200)**3
-    data = np.r_[1-data0, 1+data0]
+    data = np.concatenate([1 - data0, 1 + data0])
     fig = plt.figure()
     ax = fig.add_subplot(111)
     ax.hist(data, fill=False, log=True)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1576,7 +1576,8 @@ def transform_angles(self, angles, pts, radians=False, pushoff=1e-5):
         if not radians:
             angles = np.deg2rad(angles)
         # Move a short distance away
-        pts2 = pts + pushoff * np.c_[np.cos(angles), np.sin(angles)]
+        pts2 = pts + pushoff * np.column_stack([np.cos(angles),
+                                                np.sin(angles)])
         # Transform both sets of points
         tpts = self.transform(pts)
         tpts2 = self.transform(pts2)
