Modernize with pyupgrade and com2ann

Author: Secrus

clock

@@ -193,16 +193,16 @@ translations = {{}}
             else:
                 v = repr(v)
 
-            s.append("{}{!r}: {},\n".format("    " * tab, k, v))
-        s.append("%s}" % ("    " * (tab - 1)))
+            s.append(f"{'    ' * tab}{k!r}: {v},\n")
+        s.append(f'{"    " * (tab - 1)}}}')
 
         return "".join(s)
 
     def plural_rule_to_lambda(self, rule):
         to_py = _LambdaCompiler().compile
         result = ["lambda n: "]
         for tag, ast in PluralRule.parse(rule).abstract:
-            result.append("'{}' if {} else ".format(tag, to_py(ast)))
+            result.append(f"'{tag}' if {to_py(ast)} else ")
         result.append("'other'")
         return "".join(result)
 
@@ -217,13 +217,13 @@ translations = {{}}
                 limit = PATTERN_CHARS[fieldchar]
                 if limit and fieldnum not in limit:
                     raise ValueError(
-                        "Invalid length for field: %r" % (fieldchar * fieldnum)
+                        f"Invalid length for field: {(fieldchar * fieldnum)!r}"
                     )
                 result.append(
                     self.TOKENS_MAP.get(fieldchar * fieldnum, fieldchar * fieldnum)
                 )
             else:
-                raise NotImplementedError("Unknown token type: %s" % tok_type)
+                raise NotImplementedError(f"Unknown token type: {tok_type}")
 
         return "".join(result)
 
@@ -258,11 +258,10 @@ class WindowsTzDump(Command):
         for name in sorted_names:
             tznames[name] = raw_tznames[name]
 
-        mapping = json.dumps(tznames, indent=4)
-        mapping = "windows_timezones = " + mapping.replace('"', "'") + "\n"
+        mapping = json.dumps(tznames, indent=4).replace('"', "'")
 
         with open(os.path.join(self.MAPPING_DIR, "windows.py"), "w") as f:
-            f.write(mapping)
+            f.write(f"windows_timezones = {mapping}\n")
 
 
 app = Application("clock", __version__)

pendulum/__init__.py

@@ -53,7 +53,7 @@
 from .tz.timezone import Timezone
 
 
-_TEST_NOW = None  # type: Optional[DateTime]
+_TEST_NOW: DateTime | None = None
 _LOCALE = "en"
 _WEEK_STARTS_AT = MONDAY
 _WEEK_ENDS_AT = SUNDAY
@@ -62,7 +62,7 @@
 
 
 def _safe_timezone(
-    obj: Optional[Union[str, float, _datetime.tzinfo, Timezone]]
+    obj: str | float | _datetime.tzinfo | Timezone | None
 ) -> Timezone:
     """
     Creates a timezone instance
@@ -102,8 +102,8 @@ def datetime(
     minute: int = 0,
     second: int = 0,
     microsecond: int = 0,
-    tz: Optional[Union[str, float, Timezone]] = UTC,
-    fold: Optional[int] = 1,
+    tz: str | float | Timezone | None = UTC,
+    fold: int | None = 1,
     raise_on_unknown_times: bool = False,
 ) -> DateTime:
     """
@@ -148,7 +148,7 @@ def naive(
     minute: int = 0,
     second: int = 0,
     microsecond: int = 0,
-    fold: Optional[int] = 1,
+    fold: int | None = 1,
 ) -> DateTime:
     """
     Return a naive DateTime.
@@ -171,7 +171,7 @@ def time(hour: int, minute: int = 0, second: int = 0, microsecond: int = 0) -> T
 
 
 def instance(
-    dt: _datetime.datetime, tz: Optional[Union[str, Timezone]] = UTC
+    dt: _datetime.datetime, tz: str | Timezone | None = UTC
 ) -> DateTime:
     """
     Create a DateTime instance from a datetime one.
@@ -200,28 +200,28 @@ def instance(
     )
 
 
-def now(tz: Optional[Union[str, Timezone]] = None) -> DateTime:
+def now(tz: str | Timezone | None = None) -> DateTime:
     """
     Get a DateTime instance for the current date and time.
     """
     return DateTime.now(tz)
 
 
-def today(tz: Union[str, Timezone] = "local") -> DateTime:
+def today(tz: str | Timezone = "local") -> DateTime:
     """
     Create a DateTime instance for today.
     """
     return now(tz).start_of("day")
 
 
-def tomorrow(tz: Union[str, Timezone] = "local") -> DateTime:
+def tomorrow(tz: str | Timezone = "local") -> DateTime:
     """
     Create a DateTime instance for today.
     """
     return today(tz).add(days=1)
 
 
-def yesterday(tz: Union[str, Timezone] = "local") -> DateTime:
+def yesterday(tz: str | Timezone = "local") -> DateTime:
     """
     Create a DateTime instance for today.
     """
@@ -231,8 +231,8 @@ def yesterday(tz: Union[str, Timezone] = "local") -> DateTime:
 def from_format(
     string: str,
     fmt: str,
-    tz: Union[str, Timezone] = UTC,
-    locale: Optional[str] = None,  # noqa
+    tz: str | Timezone = UTC,
+    locale: str | None = None,  # noqa
 ) -> DateTime:
     """
     Creates a DateTime instance from a specific format.
@@ -245,7 +245,7 @@ def from_format(
 
 
 def from_timestamp(
-    timestamp: Union[int, float], tz: Union[str, Timezone] = UTC
+    timestamp: int | float, tz: str | Timezone = UTC
 ) -> DateTime:
     """
     Create a DateTime instance from a timestamp.

pendulum/_extensions/helpers.py

@@ -49,18 +49,18 @@ def __repr__(self):
         )
 
 
-def is_leap(year):  # type: (int) -> bool
+def is_leap(year: int) -> bool:
     return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0)
 
 
-def is_long_year(year):  # type: (int) -> bool
+def is_long_year(year: int) -> bool:
     def p(y):
         return y + y // 4 - y // 100 + y // 400
 
     return p(year) % 7 == 4 or p(year - 1) % 7 == 3
 
 
-def week_day(year, month, day):  # type: (int, int, int) -> int
+def week_day(year: int, month: int, day: int) -> int:
     if month < 3:
         year -= 1
 
@@ -79,14 +79,14 @@ def week_day(year, month, day):  # type: (int, int, int) -> int
     return w
 
 
-def days_in_year(year):  # type: (int) -> int
+def days_in_year(year: int) -> int:
     if is_leap(year):
         return DAYS_PER_L_YEAR
 
     return DAYS_PER_N_YEAR
 
 
-def timestamp(dt):  # type: (datetime.datetime) -> int
+def timestamp(dt: datetime.datetime) -> int:
     year = dt.year
 
     result = (year - 1970) * 365 + MONTHS_OFFSETS[0][dt.month]
@@ -109,8 +109,8 @@ def timestamp(dt):  # type: (datetime.datetime) -> int
 
 
 def local_time(
-    unix_time, utc_offset, microseconds
-):  # type: (int, int, int) -> typing.Tuple[int, int, int, int, int, int, int]
+    unix_time: int, utc_offset: int, microseconds: int
+) -> tuple[int, int, int, int, int, int, int]:
     """
     Returns a UNIX time as a broken down time
     for a particular transition type.
@@ -186,8 +186,8 @@ def local_time(
 
 
 def precise_diff(
-    d1, d2
-):  # type: (typing.Union[datetime.datetime, datetime.date], typing.Union[datetime.datetime, datetime.date]) -> PreciseDiff
+    d1: datetime.datetime | datetime.date, d2: datetime.datetime | datetime.date
+) -> PreciseDiff:
     """
     Calculate a precise difference between two datetimes.
 
@@ -351,7 +351,7 @@ def precise_diff(
     )
 
 
-def _day_number(year, month, day):  # type: (int, int, int) -> int
+def _day_number(year: int, month: int, day: int) -> int:
     month = (month + 9) % 12
     year = year - month // 10
 

pendulum/date.py

@@ -419,9 +419,9 @@ def end_of(self, unit):
         :rtype: Date
         """
         if unit not in self._MODIFIERS_VALID_UNITS:
-            raise ValueError('Invalid unit "%s" for end_of()' % unit)
+            raise ValueError(f'Invalid unit "{unit}" for end_of()')
 
-        return getattr(self, "_end_of_%s" % unit)()
+        return getattr(self, f"_end_of_{unit}")()
 
     def _start_of_day(self):
         """