rename back

Author: Conengmo

branca/colormap.py

@@ -38,19 +38,19 @@ def _is_hex(x: str) -> bool:
 
 def _parse_hex(color_code: str) -> TypeRGBAFloats:
     return (
-        _color_byte_to_normalized_float(int(color_code[1:3], 16)),
-        _color_byte_to_normalized_float(int(color_code[3:5], 16)),
-        _color_byte_to_normalized_float(int(color_code[5:7], 16)),
+        _color_int_to_float(int(color_code[1:3], 16)),
+        _color_int_to_float(int(color_code[3:5], 16)),
+        _color_int_to_float(int(color_code[5:7], 16)),
         1.0,
     )
 
 
-def _color_byte_to_normalized_float(x: Union[int, float]) -> float:
+def _color_int_to_float(x: Union[int, float]) -> float:
     """Convert an integer between 0 and 255 to a float between 0. and 1.0"""
     return x / 255.0
 
 
-def _color_normalized_float_to_byte_int(x: float) -> int:
+def _color_float_to_int(x: float) -> int:
     """Convert a float between 0. and 1.0 to an integer between 0 and 255"""
     return int(x * 255.9999)
 
@@ -78,7 +78,7 @@ def _parse_color_as_numerical_sequence(x: Union[tuple, list]) -> TypeRGBAFloats:
         raise ValueError(f"Color sequence should have 3 or 4 elements, not {len(x)}.")
     conversion_function: Callable = float
     if 1 < max(x) <= 255:
-        conversion_function = _color_byte_to_normalized_float
+        conversion_function = _color_int_to_float
     if min(x) < 0 or max(x) > 255:
         raise ValueError("Color components should be between 0.0 and 1.0 or 0 and 255.")
     color: List[float] = [conversion_function(value) for value in x]
@@ -175,9 +175,7 @@ def rgba_bytes_tuple(self, x: float) -> TypeRGBAInts:
         """Provides the color corresponding to value `x` in the
         form of a tuple (R,G,B,A) with int values between 0 and 255.
         """
-        return tuple(
-            _color_normalized_float_to_byte_int(u) for u in self.rgba_floats_tuple(x)
-        )  # type: ignore
+        return tuple(_color_float_to_int(u) for u in self.rgba_floats_tuple(x))  # type: ignore
 
     def rgb_bytes_tuple(self, x: float) -> TypeRGBInts:
         """Provides the color corresponding to value `x` in the

tests/test_colormap_parse.py

@@ -1,8 +1,8 @@
 import pytest
 
 from branca.colormap import (
-    _color_byte_to_normalized_float,
-    _color_normalized_float_to_byte_int,
+    _color_int_to_float,
+    _color_float_to_int,
     _is_hex,
     _parse_color,
     _parse_color_as_numerical_sequence,
@@ -110,7 +110,7 @@ def test_parse_hex(input_data, expected):
     ],
 )
 def test_color_byte_to_normalized_float(input_data, expected):
-    assert _color_byte_to_normalized_float(input_data) == expected
+    assert _color_int_to_float(input_data) == expected
 
 
 @pytest.mark.parametrize(
@@ -125,4 +125,4 @@ def test_color_byte_to_normalized_float(input_data, expected):
     ],
 )
 def test_color_normalized_float_to_byte_int(input_data, expected):
-    assert _color_normalized_float_to_byte_int(input_data) == expected
+    assert _color_float_to_int(input_data) == expected