Manually resolve additional ruff issues

Author: bboe

CHANGES.rst

@@ -12,12 +12,17 @@ Unreleased
 
 **Changed**
 
-- Bumped prawcore to 3.0.1.
+- Bumped prawcore to 3.0.2.
 - Drop support for Python 3.8, which was end-of-life on 2024-10-07.
 - Change ``Reddit.user.me`` to raise :class:`.ReadOnlyException` when called in
   :attr:`.read_only` mode.
 - The ``subreddit`` attribute of :class:`.Redditor` is a :class:`.UserSubreddit`
   instance.
+- The ``data`` argument to ``Objector.objectify`` must now be passed by keyword.
+- The ``mark_read`` argument to ``subreddit.modmail`` (:class:`.ModmailConversation`)
+  must now be passed by keyword.
+- The ``flair_type`` argument to :class:`.SubredditFlairTemplates` must be passed by
+  keyword.
 
 **Removed**
 

praw/config.py

@@ -8,6 +8,7 @@
 import os
 from pathlib import Path
 from threading import Lock
+from types import MappingProxyType
 from typing import Any
 
 from .exceptions import ClientException
@@ -29,13 +30,13 @@ class Config:
     CONFIG = None
     CONFIG_NOT_SET = _NotSet()  # Represents a config value that is not set.
     LOCK = Lock()
-    INTERPOLATION_LEVEL = {
+    INTERPOLATION_LEVEL = MappingProxyType({
         "basic": configparser.BasicInterpolation,
         "extended": configparser.ExtendedInterpolation,
-    }
+    })
 
     @staticmethod
-    def _config_boolean(item: bool | str) -> bool:
+    def _config_boolean(*, item: bool | str) -> bool:
         if isinstance(item, bool):
             return item
         return item.lower() in {"1", "yes", "true", "on"}
@@ -123,11 +124,11 @@ def _fetch_or_not_set(self, key: str) -> Any | _NotSet:
 
     def _initialize_attributes(self) -> None:
         self._short_url = self._fetch_default("short_url") or self.CONFIG_NOT_SET
-        self.check_for_async = self._config_boolean(self._fetch_default("check_for_async", default=True))
-        self.check_for_updates = self._config_boolean(self._fetch_or_not_set("check_for_updates"))
-        self.warn_comment_sort = self._config_boolean(self._fetch_default("warn_comment_sort", default=True))
+        self.check_for_async = self._config_boolean(item=self._fetch_default("check_for_async", default=True))
+        self.check_for_updates = self._config_boolean(item=self._fetch_or_not_set("check_for_updates"))
+        self.warn_comment_sort = self._config_boolean(item=self._fetch_default("warn_comment_sort", default=True))
         self.warn_additional_fetch_params = self._config_boolean(
-            self._fetch_default("warn_additional_fetch_params", default=True)
+            item=self._fetch_default("warn_additional_fetch_params", default=True)
         )
         self.window_size = self._fetch_default("window_size", default=600)
         self.kinds = {

praw/exceptions.py

@@ -11,7 +11,7 @@
 from __future__ import annotations
 
 
-class PRAWException(Exception):
+class PRAWException(Exception):  # noqa: N818
     """The base PRAW Exception that all other exception classes extend."""
 
 

praw/models/helpers.py

@@ -214,7 +214,7 @@ def info(self, ids: list[str]) -> Generator[praw.models.LiveThread, None, None]:
             msg = "ids must be a list"
             raise TypeError(msg)
 
-        def generator():
+        def generator() -> Generator[praw.models.LiveThread, None, None]:
             for position in range(0, len(ids), 100):
                 ids_chunk = ids[position : position + 100]
                 url = API_PATH["live_info"].format(ids=",".join(ids_chunk))

praw/models/inbox.py

@@ -296,7 +296,7 @@ def unread(
         self,
         *,
         mark_read: bool = False,
-        **generator_kwargs: str | int | dict[str, str],
+        **generator_kwargs: str | int | dict[str, str] | None,
     ) -> Iterator[praw.models.Comment | praw.models.Message]:
         """Return a :class:`.ListingGenerator` for unread comments and messages.
 

praw/models/list/base.py

@@ -39,7 +39,7 @@ def __init__(self, reddit: praw.Reddit, _data: dict[str, Any]) -> None:
 
         child_list = getattr(self, self.CHILD_ATTRIBUTE)
         for index, item in enumerate(child_list):
-            child_list[index] = reddit._objector.objectify(item)
+            child_list[index] = reddit._objector.objectify(data=item)
 
     def __iter__(self) -> Iterator[Any]:
         """Return an iterator to the list."""

praw/models/listing/generator.py

@@ -71,7 +71,7 @@ def __next__(self) -> Any:
         self.yielded += 1
         return self._listing[self._list_index - 1]
 
-    def _extract_sublist(self, listing: dict[str, Any] | list[Any]):
+    def _extract_sublist(self, listing: dict[str, Any] | list[Any] | Any) -> Any:
         if isinstance(listing, list):
             return listing[1]  # for submission duplicates
         if isinstance(listing, dict):

praw/models/listing/listing.py

@@ -24,7 +24,7 @@ def __len__(self) -> int:
     def __setattr__(self, attribute: str, value: Any) -> None:
         """Objectify the ``CHILD_ATTRIBUTE`` attribute."""
         if attribute == self.CHILD_ATTRIBUTE:
-            value = self._reddit._objector.objectify(value)
+            value = self._reddit._objector.objectify(data=value)
         super().__setattr__(attribute, value)
 
 

praw/models/listing/mixins/base.py

@@ -15,7 +15,7 @@
 class BaseListingMixin(PRAWBase):
     """Adds minimum set of methods that apply to all listing objects."""
 
-    VALID_TIME_FILTERS = {"all", "day", "hour", "month", "week", "year"}
+    VALID_TIME_FILTERS = frozenset({"all", "day", "hour", "month", "week", "year"})
 
     @staticmethod
     def _validate_time_filter(time_filter: str) -> None:

praw/models/mod_notes.py

@@ -40,7 +40,7 @@ def _all_generator(
         redditor: Redditor | str,
         subreddit: Subreddit | str,
         **generator_kwargs: Any,
-    ):
+    ) -> ListingGenerator:
         PRAWBase._safely_add_arguments(
             arguments=generator_kwargs,
             key="params",
@@ -65,7 +65,7 @@ def _bulk_generator(
             }
             response = self._reddit.get(API_PATH["mod_notes_bulk"], params=params)
             for note_dict in response["mod_notes"]:
-                yield self._reddit._objector.objectify(note_dict)
+                yield self._reddit._objector.objectify(data=note_dict)
 
     def _ensure_attribute(self, error_message: str, **attributes: Any) -> Any:
         attribute, value_ = attributes.popitem()
@@ -76,6 +76,7 @@ def _ensure_attribute(self, error_message: str, **attributes: Any) -> Any:
 
     def _notes(
         self,
+        *,
         all_notes: bool,
         redditors: list[Redditor | str],
         subreddits: list[Subreddit | str],
@@ -261,7 +262,7 @@ def delete(
             msg = "Either 'note_id' or 'delete_all' must be provided."
             raise TypeError(msg)
         if delete_all:
-            for note in self._notes(True, [redditor], [subreddit]):
+            for note in self._notes(all_notes=True, redditors=[redditor], subreddits=[subreddit]):
                 note.delete()
         else:
             params = {
@@ -361,9 +362,9 @@ def subreddits(
         if all_notes is None:
             all_notes = len(subreddits) == 1
         return self._notes(
-            all_notes,
-            [self.redditor] * len(subreddits),
-            list(subreddits),
+            all_notes=all_notes,
+            redditors=[self.redditor] * len(subreddits),
+            subreddits=list(subreddits),
             **generator_kwargs,
         )
 
@@ -457,9 +458,9 @@ def redditors(
         if all_notes is None:
             all_notes = len(redditors) == 1
         return self._notes(
-            all_notes,
-            list(redditors),
-            [self.subreddit] * len(redditors),
+            all_notes=all_notes,
+            redditors=list(redditors),
+            subreddits=[self.subreddit] * len(redditors),
             **generator_kwargs,
         )
 
@@ -627,8 +628,10 @@ def __call__(
                 merged_subreddits.append(subreddit)
             else:
                 msg = f"Cannot get subreddit and author fields from type {type(item)}"
-                raise ValueError(msg)
-        return self._notes(all_notes, merged_redditors, merged_subreddits, **generator_kwargs)
+                raise TypeError(msg)
+        return self._notes(
+            all_notes=all_notes, redditors=merged_redditors, subreddits=merged_subreddits, **generator_kwargs
+        )
 
     def things(
         self,
@@ -678,4 +681,4 @@ def things(
             redditors.append(thing.author)
         if all_notes is None:
             all_notes = len(things) == 1
-        return self._notes(all_notes, redditors, subreddits, **generator_kwargs)
+        return self._notes(all_notes=all_notes, redditors=redditors, subreddits=subreddits, **generator_kwargs)