refactor: simplify conditionals and modernize datetime usage

Apply small structural cleanups in filesize, lists, number, and time
modules (ternaries, Yoda comparison, zip strict=True). Use dt.UTC in
tests per pyupgrade.

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

Author: inquilabee

src/humanize/filesize.py

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

src/humanize/lists.py

@@ -32,7 +32,6 @@ def natural_list(items: list[Any]) -> str:
         return ""
     if len(items) == 1:
         return str(items[0])
-    elif len(items) == 2:
-        return f"{str(items[0])} and {str(items[1])}"
-    else:
-        return ", ".join([str(item) for item in items[:-1]]) + f" and {str(items[-1])}"
+    if len(items) == 2:
+        return f"{items[0]!s} and {items[1]!s}"
+    return ", ".join([str(item) for item in items[:-1]]) + f" and {items[-1]!s}"

src/humanize/number.py

@@ -56,10 +56,8 @@ def _format_not_finite(value: float) -> str:
 
     if math.isnan(value):
         return "NaN"
-    if math.isinf(value) and value < 0:
-        return "-Inf"
-    if math.isinf(value) and value > 0:
-        return "+Inf"
+    if math.isinf(value):
+        return "+Inf" if value > 0 else "-Inf"
     return ""
 
 
@@ -156,21 +154,15 @@ 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))
-            if "." in value:
-                value = float(value)
-            else:
-                value = int(value)
+            value = float(value) if "." in value else int(value)
         else:
             if not math.isfinite(float(value)):
                 return _format_not_finite(float(value))
             float(value)
     except (TypeError, ValueError):
         return str(value)
 
-    if ndigits is not None:
-        result = f"{value:,.{ndigits}f}"
-    else:
-        result = f"{value:,}"
+    result = f"{value:,.{ndigits}f}" if ndigits is not None else f"{value:,}"
     if thousands_sep != "," or decimal_sep != ".":
         result = result.translate(str.maketrans(",.", thousands_sep + decimal_sep))
     return result
@@ -547,12 +539,12 @@ def metric(value: float, unit: str = "", precision: int = 3) -> str:
 
     old_bucket = exponent // 3 * 3
     value /= 10**old_bucket
-    digits = int(max(0, precision - exponent % 3 - 1))
+    digits = max(0, precision - exponent % 3 - 1)
     if exponent < 30 and round(abs(value), digits) >= 1000:
         exponent += 3 - exponent % 3
         new_bucket = exponent // 3 * 3
         value /= 10 ** (new_bucket - old_bucket)
-        digits = int(max(0, precision - exponent % 3 - 1))
+        digits = max(0, precision - exponent % 3 - 1)
 
     if exponent >= 3:
         ordinal_ = "kMGTPEZYRQ"[exponent // 3 - 1]
@@ -561,9 +553,6 @@ def metric(value: float, unit: str = "", precision: int = 3) -> str:
     else:
         ordinal_ = ""
     value_ = format(value, f".{digits}f")
-    if not (unit or ordinal_) or unit in ("°", "′", "″"):
-        space = ""
-    else:
-        space = " "
+    space = "" if not (unit or ordinal_) or unit in ("°", "′", "″") else " "
 
     return f"{value_}{space}{ordinal_}{unit}"

src/humanize/time.py

@@ -195,7 +195,7 @@ def naturaldelta(
 
             return _ngettext("%d minute", "%d minutes", minutes) % minutes
 
-        if 3600 <= delta.seconds:
+        if delta.seconds >= 3600:
             hours = round(delta.seconds / 3600)
             if hours == 1:
                 return _("an hour")
@@ -643,7 +643,7 @@ def precisedelta(
     import math
 
     texts: list[str] = []
-    for unit, fmt in zip(reversed(Unit), fmts):
+    for unit, fmt in zip(reversed(Unit), fmts, strict=True):
         singular_txt, plural_txt, fmt_value = fmt
         if fmt_value > 0 or (not texts and unit == min_unit):
             _fmt_value = 2 if 1 < fmt_value < 2 else int(fmt_value)

tests/test_i18n.py

@@ -11,7 +11,7 @@
 import humanize
 
 with freeze_time("2020-02-02"):
-    NOW = dt.datetime.now(tz=dt.timezone.utc)
+    NOW = dt.datetime.now(tz=dt.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.timezone.utc)
+    NOW_UTC = dt.datetime.now(tz=dt.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
@@ -66,7 +66,7 @@ def test_date_and_delta() -> None:
     td_tests = [td(seconds=x) for x in int_tests]
     results = [(now - td(seconds=x), td(seconds=x)) for x in int_tests]
     for t in (int_tests, date_tests, td_tests):
-        for arg, result in zip(t, results):
+        for arg, result in zip(t, results, strict=True):
             date, d = time._date_and_delta(arg)
             assert_equal_datetime(date, result[0])
             assert_equal_timedelta(d, result[1])
@@ -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.timezone.utc
+    utc = dt.UTC
     aedt = dt.timezone(dt.timedelta(hours=11))
     cest = dt.timezone(dt.timedelta(hours=2))
     edt = dt.timezone(dt.timedelta(hours=-4))