More ruff fixes in files: stop ignoring C408, UP007, PLR5501, B006

pelican/utils.py

@@ -25,9 +25,7 @@ from typing import (
     Collection,
     Generator,
     Iterable,
-    Optional,
     Sequence,
-    Union,
 )
 
 import dateutil.parser
@@ -167,7 +165,7 @@ class memoized:
             self.cache[args] = value
             return value
 
-    def __repr__(self) -> Optional[str]:
+    def __repr__(self) -> str | None:
         return self.func.__doc__
 
     def __get__(self, obj: Any, objtype):
@@ -181,8 +179,8 @@ def deprecated_attribute(
     old: str,
     new: str,
     since: tuple[int, ...],
-    remove: Optional[tuple[int, ...]] = None,
-    doc: Optional[str] = None,
+    remove: tuple[int, ...] | None = None,
+    doc: str | None = None,
 ):
     """Attribute deprecation decorator for gentle upgrades
 
@@ -296,9 +294,7 @@ def slugify(
     return value.strip()
 
 
-def copy(
-    source: str, destination: str, ignores: Optional[Iterable[str]] = None
-) -> None:
+def copy(source: str, destination: str, ignores: Iterable[str] | None = None) -> None:
     """Recursively copy source into destination.
 
     If source is a file, destination has to be a file as well.
@@ -364,7 +360,7 @@ def copy(
                     copy_file(src_path, dst_path)
                 else:
                     logger.warning(
-                        "Skipped copy %s (not a file or " "directory) to %s",
+                        "Skipped copy %s (not a file or directory) to %s",
                         src_path,
                         dst_path,
                     )
@@ -474,7 +470,7 @@ class _HTMLWordTruncator(HTMLParser):
         self.words_found = 0
         self.open_tags = []
         self.last_word_end = None
-        self.truncate_at: Optional[int] = None
+        self.truncate_at: int | None = None
 
     def feed(self, *args, **kwargs) -> None:
         try:
@@ -573,11 +569,10 @@ class _HTMLWordTruncator(HTMLParser):
         if self.last_word_end is None:
             if self._word_prefix_regex.match(char):
                 self.last_word_end = ref_end
+        elif self._word_regex.match(char):
+            self.last_word_end = ref_end
         else:
-            if self._word_regex.match(char):
-                self.last_word_end = ref_end
-            else:
-                self.add_last_word()
+            self.add_last_word()
 
     def handle_entityref(self, name: str) -> None:
         """
@@ -638,7 +633,7 @@ def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
 
 def process_translations(
     content_list: list[Content],
-    translation_id: Optional[Union[str, Collection[str]]] = None,
+    translation_id: str | Collection[str] | None = None,
 ) -> tuple[list[Content], list[Content]]:
     """Finds translations and returns them.
 
@@ -739,7 +734,7 @@ def get_original_items(items: list[Content], with_str: str) -> list[Content]:
 
 def order_content(
     content_list: list[Content],
-    order_by: Union[str, Callable[[Content], Any], None] = "slug",
+    order_by: str | Callable[[Content], Any] | None = "slug",
 ) -> list[Content]:
     """Sorts content.
 
@@ -841,7 +836,7 @@ def wait_for_changes(
 
 
 def set_date_tzinfo(
-    d: datetime.datetime, tz_name: Optional[str] = None
+    d: datetime.datetime, tz_name: str | None = None
 ) -> datetime.datetime:
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
@@ -857,7 +852,7 @@ def mkdir_p(path: str) -> None:
     os.makedirs(path, exist_ok=True)
 
 
-def split_all(path: Union[str, pathlib.Path, None]) -> Optional[Sequence[str]]:
+def split_all(path: str | pathlib.Path | None) -> Sequence[str] | None:
     """Split a path into a list of components
 
     While os.path.split() splits a single component off the back of
@@ -911,7 +906,7 @@ def maybe_pluralize(count: int, singular: str, plural: str) -> str:
 
 @contextmanager
 def temporary_locale(
-    temp_locale: Optional[str] = None, lc_category: int = locale.LC_ALL
+    temp_locale: str | None = None, lc_category: int = locale.LC_ALL
 ) -> Generator[None, None, None]:
     """
     Enable code to run in a context with a temporary locale