fix: restore 3.10 timezone usage and revert ternaries

Use datetime.timezone.utc instead of datetime.UTC for Python 3.10
compatibility. Revert conditional-expression refactors per maintainer
feedback while keeping zip(strict=True), Yoda fix, and list flattening.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: inquilabee

src/humanize/filesize.py

@@ -83,8 +83,10 @@ def naturalsize(
     """
     if gnu:
         suffix = suffixes["gnu"]
+    elif binary:
+        suffix = suffixes["binary"]
     else:
-        suffix = suffixes["binary"] if binary else suffixes["decimal"]
+        suffix = suffixes["decimal"]
 
     base = 1024 if (gnu or binary) else 1000
     bytes_ = float(value)

src/humanize/number.py

@@ -56,8 +56,10 @@ def _format_not_finite(value: float) -> str:
 
     if math.isnan(value):
         return "NaN"
-    if math.isinf(value):
-        return "+Inf" if value > 0 else "-Inf"
+    if math.isinf(value) and value < 0:
+        return "-Inf"
+    if math.isinf(value) and value > 0:
+        return "+Inf"
     return ""
 
 
@@ -154,15 +156,21 @@ def intcomma(value: NumberOrString, ndigits: int | None = None) -> str:
             value = value.replace(thousands_sep, "").replace(decimal_sep, ".")
             if not math.isfinite(float(value)):
                 return _format_not_finite(float(value))
-            value = float(value) if "." in value else int(value)
+            if "." in value:
+                value = float(value)
+            else:
+                value = int(value)
         else:
             if not math.isfinite(float(value)):
                 return _format_not_finite(float(value))
             float(value)
     except (TypeError, ValueError):
         return str(value)
 
-    result = f"{value:,.{ndigits}f}" if ndigits is not None else f"{value:,}"
+    if ndigits is not None:
+        result = f"{value:,.{ndigits}f}"
+    else:
+        result = f"{value:,}"
     if thousands_sep != "," or decimal_sep != ".":
         result = result.translate(str.maketrans(",.", thousands_sep + decimal_sep))
     return result
@@ -553,6 +561,9 @@ def metric(value: float, unit: str = "", precision: int = 3) -> str:
     else:
         ordinal_ = ""
     value_ = format(value, f".{digits}f")
-    space = "" if not (unit or ordinal_) or unit in ("°", "′", "″") else " "
+    if not (unit or ordinal_) or unit in ("°", "′", "″"):
+        space = ""
+    else:
+        space = " "
 
     return f"{value_}{space}{ordinal_}{unit}"

tests/test_i18n.py

@@ -11,7 +11,7 @@
 import humanize
 
 with freeze_time("2020-02-02"):
-    NOW = dt.datetime.now(tz=dt.UTC)
+    NOW = dt.datetime.now(tz=dt.timezone.utc)
 
 
 @freeze_time("2020-02-02")

tests/test_time.py

@@ -27,7 +27,7 @@
 
 with freeze_time(FROZEN_DATE):
     NOW = dt.datetime.now()
-    NOW_UTC = dt.datetime.now(tz=dt.UTC)
+    NOW_UTC = dt.datetime.now(tz=dt.timezone.utc)
     NOW_UTC_PLUS_01_00 = dt.datetime.now(tz=dt.timezone(offset=dt.timedelta(hours=1)))
     TODAY = dt.date.today()
     TOMORROW = TODAY + ONE_DAY_DELTA
@@ -303,7 +303,7 @@ def test_naturaldate(test_input: dt.date, expected: str) -> None:
 @freeze_time("2023-10-15 23:00:00+00:00")
 def test_naturaldate_tz_aware() -> None:
     """naturaldate should compare dates in the timezone of the given value."""
-    utc = dt.UTC
+    utc = dt.timezone.utc
     aedt = dt.timezone(dt.timedelta(hours=11))
     cest = dt.timezone(dt.timedelta(hours=2))
     edt = dt.timezone(dt.timedelta(hours=-4))