Fix missing math.isclose (#261)

* Fix missing math.isclose

* Fix other cases of isclose

Author: facelessuser

CHANGES.md

@@ -1,5 +1,11 @@
 # ColorHelper
 
+## 6.3.2
+
+- **FIX**: Fix missing requirement for `math.isclose` in ColorAide  
+  (Python 3.3).
+- **FIX**: Do not pad preview by default due to performance impact.
+
 ## 6.3.1
 
 - **FIX**: Update to ColorAide 2.9.1 which uses the exact CSS HWB

lib/coloraide/algebra.py

@@ -86,6 +86,11 @@ def prod(values: Iterable[SupportsFloatOrInt]) -> SupportsFloatOrInt:
 ################################
 # General math
 ################################
+def _math_isclose(a, b, rel_tol=1e-9, abs_tol=0.0):
+    """Test if values are close."""
+
+    return abs(a-b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
+
 @deprecated("Please use math.isnan or alg.isnan for a generic approach for vectors and matrices")
 def is_nan(obj: float) -> bool:
     """Check if "not a number"."""
@@ -550,20 +555,20 @@ def monotone(p0: float, p1: float, p2: float, p3: float, t: float) -> float:
     m2 = (s1 + s2) * 0.5
 
     # Center segment should be horizontal as there is no increase/decrease between the two points
-    if math.isclose(p1, p2):
+    if _math_isclose(p1, p2):
         m1 = m2 = 0.0
     else:
 
         # Gradient is zero if segment is horizontal or if the left hand secant differs in sign from current.
-        if math.isclose(p0, p1) or (math.copysign(1.0, s0) != math.copysign(1.0, s1)):
+        if _math_isclose(p0, p1) or (math.copysign(1.0, s0) != math.copysign(1.0, s1)):
             m1 = 0.0
 
         # Ensure gradient magnitude is either 3 times the left or current secant (smaller being preferred).
         else:
             m1 *= min(3.0 * s0 / m1, min(3.0 * s1 / m1, 1.0))
 
         # Gradient is zero if segment is horizontal or if the right hand secant differs in sign from current.
-        if math.isclose(p2, p3) or (math.copysign(1.0, s1) != math.copysign(1.0, s2)):
+        if _math_isclose(p2, p3) or (math.copysign(1.0, s1) != math.copysign(1.0, s2)):
             m2 = 0.0
 
         # Ensure gradient magnitude is either 3 times the current or right secant (smaller being preferred).
@@ -1773,7 +1778,7 @@ def linspace(start: Union[ArrayLike, float], stop: Union[ArrayLike, float], num:
 def _isclose(a: float, b: float, *, equal_nan: bool = False, **kwargs: Any) -> bool:
     """Check if values are close."""
 
-    close = math.isclose(a, b, **kwargs)
+    close = _math_isclose(a, b, **kwargs)
     return (math.isnan(a) and math.isnan(b)) if not close and equal_nan else close
 
 

lib/coloraide/gamut/fit_lch_chroma.py

@@ -3,6 +3,7 @@
 from ..cat import WHITES
 from .. import util
 import math
+from .. import algebra as alg
 from typing import TYPE_CHECKING, Any, Dict
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -50,7 +51,10 @@ def fit(self, color: 'Color', **kwargs: Any) -> None:
 
         # Return white or black if lightness is out of dynamic range for lightness.
         # Extreme light case only applies to SDR, but dark case applies to all ranges.
-        if sdr and (lightness >= self.MAX_LIGHTNESS or math.isclose(lightness, self.MAX_LIGHTNESS, abs_tol=1e-6)):
+        if (
+            sdr and
+            (lightness >= self.MAX_LIGHTNESS or alg.isclose(lightness, self.MAX_LIGHTNESS, abs_tol=1e-6, dims=alg.SC))
+        ):
             clip_channels(color.update('xyz-d65', WHITE, mapcolor[-1]))
             return
         elif lightness <= self.MIN_LIGHTNESS:

lib/coloraide/spaces/cmy.py

@@ -43,7 +43,7 @@ def is_achromatic(self, coords: Vector) -> bool:
 
         black = [1, 1, 1]
         for x in alg.vcross(coords, black):
-            if not math.isclose(0.0, x, abs_tol=1e-4):
+            if not alg.isclose(0.0, x, abs_tol=1e-4, dims=algs.SC):
                 return False
         return True
 

lib/coloraide/spaces/cmyk.py

@@ -60,12 +60,12 @@ class CMYK(Space):
     def is_achromatic(self, coords: Vector) -> bool:
         """Test if color is achromatic."""
 
-        if math.isclose(1.0, coords[-1], abs_tol=1e-4):
+        if alg.isclose(1.0, coords[-1], abs_tol=1e-4, dims=alg.SC):
             return True
 
         black = [1, 1, 1]
         for x in alg.vcross(coords[:-1], black):
-            if not math.isclose(0.0, x, abs_tol=1e-5):
+            if not alg.isclose(0.0, x, abs_tol=1e-5, dims=alg.SC):
                 return False
         return True
 

lib/coloraide/spaces/prismatic.py

@@ -56,12 +56,12 @@ class Prismatic(Space):
     def is_achromatic(self, coords: Vector) -> bool:
         """Test if color is achromatic."""
 
-        if math.isclose(0.0, coords[0], abs_tol=1e-4):
+        if alg.isclose(0.0, coords[0], abs_tol=1e-4, dims=alg.SC):
             return True
 
         white = [1, 1, 1]
         for x in alg.vcross(coords[:-1], white):
-            if not math.isclose(0.0, x, abs_tol=1e-5):
+            if not alg.isclose(0.0, x, abs_tol=1e-5, dims=alg.SC):
                 return False
         return True
 

lib/coloraide/spaces/ryb.py

@@ -76,7 +76,7 @@ def is_achromatic(self, coords: Vector) -> bool:
 
         coords = self.to_base(coords)
         for x in alg.vcross(coords, [1, 1, 1]):
-            if not math.isclose(0.0, x, abs_tol=1e-5):
+            if not alg.isclose(0.0, x, abs_tol=1e-5, dims=alg.SC):
                 return False
         return True
 

lib/coloraide/spaces/srgb/__init__.py

@@ -67,7 +67,7 @@ def is_achromatic(self, coords: Vector) -> bool:
 
         white = [1, 1, 1]
         for x in alg.vcross(coords, white):
-            if not math.isclose(0.0, x, abs_tol=1e-5):
+            if not alg.isclose(0.0, x, abs_tol=1e-5, dims=alg.SC):
                 return False
         return True
 

lib/coloraide/spaces/xyy.py

@@ -29,7 +29,7 @@ class xyY(Space):
     def is_achromatic(self, coords: Vector) -> bool:
         """Test if color is achromatic."""
 
-        if math.isclose(0.0, coords[-1], abs_tol=1e-4):
+        if alg.isclose(0.0, coords[-1], abs_tol=1e-4, dims=alg.SC):
             return True
 
         for x in alg.vcross(coords[:-1], self.WHITE):

lib/coloraide/spaces/xyz_d65.py

@@ -26,7 +26,7 @@ def is_achromatic(self, coords: Vector) -> bool:
         """Is achromatic."""
 
         for x in alg.vcross(coords, util.xy_to_xyz(self.white())):
-            if not math.isclose(0.0, x, abs_tol=1e-5):
+            if not alg.isclose(0.0, x, abs_tol=1e-5, dims=alg.SC):
                 return False
         return True