Merge pull request matplotlib#24295 from anntzer/ua

Remove unnecessary np.{,as}array / astype calls.

Author: timhoffm

examples/event_handling/path_editor.py

@@ -82,17 +82,12 @@ def get_ind_under_point(self, event):
         Return the index of the point closest to the event position or *None*
         if no point is within ``self.epsilon`` to the event position.
         """
-        # display coords
-        xy = np.asarray(self.pathpatch.get_path().vertices)
-        xyt = self.pathpatch.get_transform().transform(xy)
+        xy = self.pathpatch.get_path().vertices
+        xyt = self.pathpatch.get_transform().transform(xy)  # to display coords
         xt, yt = xyt[:, 0], xyt[:, 1]
         d = np.sqrt((xt - event.x)**2 + (yt - event.y)**2)
         ind = d.argmin()
-
-        if d[ind] >= self.epsilon:
-            ind = None
-
-        return ind
+        return ind if d[ind] < self.epsilon else None
 
     def on_draw(self, event):
         """Callback for draws."""

examples/subplots_axes_and_figures/secondary_axis.py

@@ -59,7 +59,7 @@ def rad2deg(x):
 
 def one_over(x):
     """Vectorized 1/x, treating x==0 manually"""
-    x = np.array(x).astype(float)
+    x = np.array(x, float)
     near_zero = np.isclose(x, 0)
     x[near_zero] = np.inf
     x[~near_zero] = 1 / x[~near_zero]

examples/units/basic_units.py

@@ -144,7 +144,7 @@ def __getattribute__(self, name):
         return object.__getattribute__(self, name)
 
     def __array__(self, dtype=object):
-        return np.asarray(self.value).astype(dtype)
+        return np.asarray(self.value, dtype)
 
     def __array_wrap__(self, array, context):
         return TaggedValue(array, self.unit)

lib/matplotlib/backend_bases.py

@@ -1464,7 +1464,7 @@ def on_pick(event):
             line = event.artist
             xdata, ydata = line.get_data()
             ind = event.ind
-            print('on pick line:', np.array([xdata[ind], ydata[ind]]).T)
+            print(f'on pick line: {xdata[ind]:.3f}, {ydata[ind]:.3f}')
 
         cid = fig.canvas.mpl_connect('pick_event', on_pick)
     """

lib/matplotlib/collections.py

@@ -547,8 +547,8 @@ def set_offsets(self, offsets):
         if offsets.shape == (2,):  # Broadcast (2,) -> (1, 2) but nothing else.
             offsets = offsets[None, :]
         self._offsets = np.column_stack(
-            (np.asarray(self.convert_xunits(offsets[:, 0]), 'float'),
-             np.asarray(self.convert_yunits(offsets[:, 1]), 'float')))
+            (np.asarray(self.convert_xunits(offsets[:, 0]), float),
+             np.asarray(self.convert_yunits(offsets[:, 1]), float)))
         self.stale = True
 
     def get_offsets(self):
@@ -573,7 +573,7 @@ def set_linewidth(self, lw):
         if lw is None:
             lw = self._get_default_linewidth()
         # get the un-scaled/broadcast lw
-        self._us_lw = np.atleast_1d(np.asarray(lw))
+        self._us_lw = np.atleast_1d(lw)
 
         # scale all of the dash patterns.
         self._linewidths, self._linestyles = self._bcast_lwls(

lib/matplotlib/contour.py

@@ -1144,7 +1144,7 @@ def _process_contour_level_args(self, args):
         if isinstance(levels_arg, Integral):
             self.levels = self._autolev(levels_arg)
         else:
-            self.levels = np.asarray(levels_arg).astype(np.float64)
+            self.levels = np.asarray(levels_arg, np.float64)
 
         if not self.filled:
             inside = (self.levels > self.zmin) & (self.levels < self.zmax)

lib/matplotlib/image.py

@@ -1701,7 +1701,7 @@ def _pil_png_to_float_array(pil_png):
     mode = pil_png.mode
     rawmode = pil_png.png.im_rawmode
     if rawmode == "1":  # Grayscale.
-        return np.asarray(pil_png).astype(np.float32)
+        return np.asarray(pil_png, np.float32)
     if rawmode == "L;2":  # Grayscale.
         return np.divide(pil_png, 2**2 - 1, dtype=np.float32)
     if rawmode == "L;4":  # Grayscale.

lib/matplotlib/patches.py

@@ -1221,9 +1221,7 @@ def _recompute_path(self):
                 arc.codes, [connector, connector, Path.CLOSEPOLY]])
 
         # Shift and scale the wedge to the final location.
-        v *= self.r
-        v += np.asarray(self.center)
-        self._path = Path(v, c)
+        self._path = Path(v * self.r + self.center, c)
 
     def set_center(self, center):
         self._path = None

lib/matplotlib/sankey.py

@@ -434,10 +434,7 @@ def add(self, patchlabel='', flows=None, orientations=None, labels='',
         Sankey.finish
         """
         # Check and preprocess the arguments.
-        if flows is None:
-            flows = np.array([1.0, -1.0])
-        else:
-            flows = np.array(flows)
+        flows = np.array([1.0, -1.0]) if flows is None else np.array(flows)
         n = flows.shape[0]  # Number of flows
         if rotation is None:
             rotation = 0

lib/matplotlib/testing/compare.py

@@ -500,8 +500,8 @@ def save_diff_image(expected, actual, output):
     actual_image = _load_image(actual)
     actual_image, expected_image = crop_to_same(
         actual, actual_image, expected, expected_image)
-    expected_image = np.array(expected_image).astype(float)
-    actual_image = np.array(actual_image).astype(float)
+    expected_image = np.array(expected_image, float)
+    actual_image = np.array(actual_image, float)
     if expected_image.shape != actual_image.shape:
         raise ImageComparisonFailure(
             "Image sizes do not match expected size: {} "