Replace checking Number with Real

Author: oscargus

lib/matplotlib/artist.py

@@ -4,7 +4,7 @@
 import inspect
 from inspect import Signature, Parameter
 import logging
-from numbers import Number
+from numbers import Number, Real
 import re
 import warnings
 
@@ -1013,7 +1013,7 @@ def set_alpha(self, alpha):
         alpha : scalar or None
             *alpha* must be within the 0-1 range, inclusive.
         """
-        if alpha is not None and not isinstance(alpha, Number):
+        if alpha is not None and not isinstance(alpha, Real):
             raise TypeError(
                 f'alpha must be numeric or None, not {type(alpha)}')
         if alpha is not None and not (0 <= alpha <= 1):

lib/matplotlib/axes/_axes.py

@@ -2,7 +2,7 @@
 import itertools
 import logging
 import math
-from numbers import Integral, Number
+from numbers import Integral, Number, Real
 
 import numpy as np
 from numpy import ma
@@ -582,7 +582,7 @@ def invert(x):
             secax.set_xlabel('Period [s]')
             plt.show()
         """
-        if location in ['top', 'bottom'] or isinstance(location, Number):
+        if location in ['top', 'bottom'] or isinstance(location, Real):
             secondary_ax = SecondaryAxis(self, 'x', location, functions,
                                          **kwargs)
             self.add_child_axes(secondary_ax)
@@ -614,7 +614,7 @@ def secondary_yaxis(self, location, *, functions=None, **kwargs):
                                                            np.rad2deg))
             secax.set_ylabel('radians')
         """
-        if location in ['left', 'right'] or isinstance(location, Number):
+        if location in ['left', 'right'] or isinstance(location, Real):
             secondary_ax = SecondaryAxis(self, 'y', location,
                                          functions, **kwargs)
             self.add_child_axes(secondary_ax)
@@ -3219,7 +3219,7 @@ def get_next_color():
 
         hatch_cycle = itertools.cycle(np.atleast_1d(hatch))
 
-        _api.check_isinstance(Number, radius=radius, startangle=startangle)
+        _api.check_isinstance(Real, radius=radius, startangle=startangle)
         if radius <= 0:
             raise ValueError(f'radius must be a positive number, not {radius}')
 
@@ -4188,7 +4188,7 @@ def do_patch(xs, ys, **kwargs):
             raise ValueError(datashape_message.format("positions"))
 
         positions = np.array(positions)
-        if len(positions) > 0 and not isinstance(positions[0], Number):
+        if len(positions) > 0 and not all(isinstance(p, Real) for p in positions):
             raise TypeError("positions should be an iterable of numbers")
 
         # width

lib/matplotlib/axis.py

@@ -5,7 +5,7 @@
 import datetime
 import functools
 import logging
-from numbers import Number
+from numbers import Real
 
 import numpy as np
 
@@ -1901,7 +1901,7 @@ def set_pickradius(self, pickradius):
             The acceptance radius for containment tests.
             See also `.Axis.contains`.
         """
-        if not isinstance(pickradius, Number) or pickradius < 0:
+        if not isinstance(pickradius, Real) or pickradius < 0:
             raise ValueError("pick radius should be a distance")
         self._pickradius = pickradius
 

lib/matplotlib/colors.py

@@ -46,7 +46,7 @@
 import inspect
 import io
 import itertools
-from numbers import Number
+from numbers import Real
 import re
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
@@ -381,7 +381,7 @@ def _to_rgba_no_colorcycle(c, alpha=None):
         raise ValueError(f"Invalid RGBA argument: {orig_c!r}")
     if len(c) not in [3, 4]:
         raise ValueError("RGBA sequence should have length 3 or 4")
-    if not all(isinstance(x, Number) for x in c):
+    if not all(isinstance(x, Real) for x in c):
         # Checks that don't work: `map(float, ...)`, `np.array(..., float)` and
         # `np.array(...).astype(float)` would all convert "0.5" to 0.5.
         raise ValueError(f"Invalid RGBA argument: {orig_c!r}")

lib/matplotlib/lines.py

@@ -514,7 +514,7 @@ def set_pickradius(self, pickradius):
         pickradius : float
             Pick radius, in points.
         """
-        if not isinstance(pickradius, Number) or pickradius < 0:
+        if not isinstance(pickradius, Real) or pickradius < 0:
             raise ValueError("pick radius should be a distance")
         self._pickradius = pickradius
 

lib/matplotlib/patches.py

@@ -5,7 +5,7 @@
 import functools
 import inspect
 import math
-from numbers import Number
+from numbers import Number, Real
 import textwrap
 from types import SimpleNamespace
 from collections import namedtuple
@@ -769,7 +769,7 @@ def rotation_point(self):
     def rotation_point(self, value):
         if value in ['center', 'xy'] or (
                 isinstance(value, tuple) and len(value) == 2 and
-                isinstance(value[0], Number) and isinstance(value[1], Number)
+                isinstance(value[0], Real) and isinstance(value[1], Real)
                 ):
             self._rotation_point = value
         else:

lib/matplotlib/pyplot.py

@@ -41,7 +41,6 @@
 import importlib
 import inspect
 import logging
-from numbers import Number
 import re
 import sys
 import threading

lib/matplotlib/rcsetup.py

@@ -15,7 +15,7 @@
 
 import ast
 from functools import lru_cache, reduce
-from numbers import Number
+from numbers import Real
 import operator
 import os
 import re
@@ -475,9 +475,9 @@ def _is_iterable_not_string_like(x):
             offset = 0
             onoff = ls
 
-        if (isinstance(offset, Number)
+        if (isinstance(offset, Real)
                 and len(onoff) % 2 == 0
-                and all(isinstance(elem, Number) for elem in onoff)):
+                and all(isinstance(elem, Real) for elem in onoff)):
             return (offset, onoff)
 
     raise ValueError(f"linestyle {ls!r} is not a valid on-off ink sequence.")

lib/mpl_toolkits/axes_grid1/axes_size.py

@@ -9,7 +9,7 @@ class (or others) to determine the size of each Axes. The unit
 values are used.
 """
 
-from numbers import Number
+from numbers import Real
 
 from matplotlib import _api
 from matplotlib.axes import Axes
@@ -55,7 +55,7 @@ class Fixed(_Base):
     """
 
     def __init__(self, fixed_size):
-        _api.check_isinstance(Number, fixed_size=fixed_size)
+        _api.check_isinstance(Real, fixed_size=fixed_size)
         self.fixed_size = fixed_size
 
     def get_size(self, renderer):
@@ -190,7 +190,7 @@ class Fraction(_Base):
     """
 
     def __init__(self, fraction, ref_size):
-        _api.check_isinstance(Number, fraction=fraction)
+        _api.check_isinstance(Real, fraction=fraction)
         self._fraction_ref = ref_size
         self._fraction = fraction
 
@@ -231,7 +231,7 @@ def from_any(size, fraction_ref=None):
     >>> a = Size.from_any(1.2) # => Size.Fixed(1.2)
     >>> Size.from_any("50%", a) # => Size.Fraction(0.5, a)
     """
-    if isinstance(size, Number):
+    if isinstance(size, Real):
         return Fixed(size)
     elif isinstance(size, str):
         if size[-1] == "%":