Handle the case where the number is a number of hours in second better

Author: Pierre-Sassoulas

pylint/checkers/format.py

@@ -112,18 +112,57 @@ def to_standard_scientific_notation(cls, number: float) -> str:
 
     @classmethod
     def to_understandable_time(cls, number: float) -> str:
-        if number == 0.0 or number % 3600 != 0 or number // 3600 == 1:
-            return ""  # Not a suspected time
-        parts: list[int] = [3600]
+        if (
+            number % 3600 != 0  # not a multiple of the number of second in an hour
+            or number == 0.0  # 0 is congruent to 3600, but not a time
+        ):
+            return ""
+        if number // 3600 == 1:
+            # If we have to advise a proper time for 3600, it means the threshold
+            # was under 3600, so we advise even more decomposition
+            return "60 * 60"
+        parts: list[int | str] = [3600]
         number //= 3600
         for divisor in (24, 7, 365):
             if number % divisor == 0:
                 parts.append(divisor)
                 number //= divisor
         remainder = int(number)
+        days_to_add = None
+        hours_to_add = None
+        exp = 0
+        while remainder > 1 and remainder % 1000 == 0:
+            # suspected watt hour remove prior to decomposition
+            remainder //= 1000
+            exp += 3
+        if exp:
+            parts.append(f"1e{exp}")
+        else:
+            days = int(remainder // 24)
+            hours_to_remove = remainder % 24
+            print(remainder, days, hours_to_remove)
+            if days > 1 and hours_to_remove != 0:
+                parts += [24]
+                hours_to_add = f" + ({hours_to_remove} * 3600)"
+                remainder -= hours_to_remove
+                remainder //= 24
+            year = int(remainder // 365)
+            days_to_remove = remainder % 365
+            if year > 1 and days_to_remove != 0:
+                parts += [365]
+                days_to_add = f" + ({days_to_remove} * 3600 * 24)"
+                remainder -= days_to_remove
+                remainder //= 365
         if remainder != 1:
             parts.append(remainder)
-        return " * ".join([str(p) for p in parts])
+        result = " * ".join([str(p) for p in parts])
+        if days_to_add:
+            result = f"({result}){days_to_add}"
+            if hours_to_add:
+                result += hours_to_add
+        elif hours_to_add:
+            result = f"({result}){hours_to_add}"
+        return result
 
     @classmethod
     def to_standard_engineering_notation(cls, number: float) -> str:

tests/checkers/unittest_format.py

@@ -250,15 +250,18 @@ def test_to_another_standard_notation(
 @pytest.mark.parametrize(
     "value,expected",
     [
-        (3600, ""),
-        (86400, "3600 * 24"),
-        (604800, "3600 * 24 * 7"),
-        (2592000, "3600 * 24 * 30"),
-        (31536000, "3600 * 24 * 365"),
-        (1180800, "3600 * 24 * 14 - (8 * 3600)"),
-        (315360000, "3600 * 24 * 365 * 10"),
+        (3600, "60 * 60"),
+        (3600 * 1e12, "3600 * 1e12"),
+        (3600 * 1e6 * 24, "3600 * 24 * 1e6"),
+        (3600 * 24, "3600 * 24"),
+        (3600 * 24 * 7, "3600 * 24 * 7"),
+        (3600 * 24 * 30, "3600 * 24 * 30"),
+        (3600 * 24 * 365, "3600 * 24 * 365"),
+        (3600 * 24 * 14 - (8 * 3600), "(3600 * 24 * 13) + (16 * 3600)"),
+        (3600 * 24 * 365 * 10, "3600 * 24 * 365 * 10"),
+        (428182 * 3600, "(3600 * 24 * 365 * 48) + (320 * 3600 * 24) + (22 * 3600)"),
     ],
 )
 def test_to_understandable_time(value: int, expected: str) -> None:
     actual = FloatFormatterHelper.to_understandable_time(value)
-    assert actual == expected, f"Expected {expected} for {value}, got {actual}"
+    assert actual == expected, f"Expected {expected!r} for {value!r}, got {actual!r}"

tests/functional/b/bad_float/bad_float_notation_default.txt

@@ -52,6 +52,6 @@ bad-float-notation:122:21:122:28::'1.5_6e3' has exponent and underscore at the s
 bad-float-notation:123:27:123:33::'15_6e2' has exponent and underscore at the same time, and it should be written as '1.56e4' or '15.600000000000001e3' or '15_600.0' instead:HIGH
 bad-float-notation:126:35:126:43::'10.0_0e3' has exponent and underscore at the same time, and it should be written as '10_000.0' or '10e3' or '1e4' instead:HIGH
 bad-float-notation:126:57:126:65::'20.0_0e3' has exponent and underscore at the same time, and it should be written as '20_000.0' or '20e3' or '2e4' instead:HIGH
-bad-float-notation:141:37:141:46::'1180800.0' is bigger than 1e6, and it should be written as '1.1808e6' or '1_180_800.0' or '3600 * 328' instead:HIGH
+bad-float-notation:141:37:141:46::'1180800.0' is bigger than 1e6, and it should be written as '(3600 * 24 * 13) + (16 * 3600)' or '1.1808e6' or '1_180_800.0' instead:HIGH
 bad-float-notation:142:28:142:38::'31536000.0' is bigger than 1e6, and it should be written as '3.1536e7' or '31.536e6' or '31_536_000.0' or '3600 * 24 * 365' instead:HIGH
 bad-float-notation:143:29:143:38::'2592000.0' is bigger than 1e6, and it should be written as '2.592e6' or '2_592_000.0' or '3600 * 24 * 30' instead:HIGH