Apply fixes for ruff linting

Author: ChrisLovering

dev/bot/__init__.py

@@ -21,4 +21,4 @@ class Bot(pydis_core.BotBase):
     async def setup_hook(self) -> None:
         """Load extensions on startup."""
         await super().setup_hook()
-        asyncio.create_task(self.load_extensions(sys.modules[__name__]))
+        await self.load_extensions(sys.modules[__name__])

dev/bot/__main__.py

@@ -7,6 +7,7 @@
 from discord.ext import commands
 
 import pydis_core
+
 from . import Bot
 
 dotenv.load_dotenv()
@@ -17,7 +18,7 @@
 
 bot = Bot(
     guild_id=int(os.getenv("GUILD_ID")),
-    http_session=None,  # type: ignore # We need to instantiate the session in an async context
+    http_session=None,  # type: ignore We need to instantiate the session in an async context
     allowed_roles=roles,
     command_prefix=commands.when_mentioned_or(os.getenv("PREFIX", "!")),
     intents=discord.Intents.all(),

dev/bot/cog.py

@@ -12,7 +12,7 @@ def __init__(self, _bot: Bot):
     @commands.Cog.listener()
     async def on_ready(self) -> None:
         """Print a message when the client (re)connects."""
-        print("Client is ready.")
+        print("Client is ready.")  # noqa: T201
 
     @commands.command()
     async def reload(self, ctx: commands.Context) -> None:

docs/conf.py

@@ -1,6 +1,7 @@
 # Configuration file for the Sphinx documentation builder.
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 
+import contextlib
 import functools
 import os.path
 import shutil
@@ -16,7 +17,7 @@
 logger = sphinx.util.logging.getLogger(__name__)
 
 # Handle the path not being set correctly in actions.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 from docs import utils  # noqa: E402
 
@@ -209,10 +210,9 @@ def _releases_setup(app: Sphinx) -> dict:
 smv_branch_whitelist = "main"
 if os.getenv("BUILD_DOCS_FOR_HEAD", "False").lower() == "true":
     if not (branch := os.getenv("BRANCH_NAME")):
-        try:
+        with contextlib.suppress(git.InvalidGitRepositoryError):
             branch = git.Repo(PROJECT_ROOT).active_branch.name
-        except git.InvalidGitRepositoryError:
-            pass
+
 
     if branch:
         logger.info(f"Adding branch {branch} to build whitelist.")

docs/netlify_build.py

@@ -22,5 +22,5 @@
 
 if __name__ == "__main__":
     # Run the build script
-    print("Build started")
-    subprocess.run([sys.executable, OUTPUT.absolute()])
+    print("Build started")  # noqa: T201
+    subprocess.run([sys.executable, OUTPUT.absolute()])  # noqa: S603

docs/utils.py

@@ -30,16 +30,15 @@ def get_build_root() -> Path:
 def is_attribute(module: types.ModuleType, parameter: str) -> bool:
     """Returns true if `parameter` is an attribute of `module`."""
     docs = docstring_parser.parse(inspect.getdoc(module), docstring_parser.DocstringStyle.GOOGLE)
-    for param in docs.params:
+    for param in docs.params:  # noqa: SIM110
         # The docstring_parser library can mis-parse arguments like `arg (:obj:`str`)` as `arg (`
         # which would create a false-negative below, so we just strip away the extra parenthesis.
         if param.args[0] == "attribute" and param.arg_name.rstrip(" (") == parameter:
             return True
-
     return False
 
 
-def linkcode_resolve(repo_link: str, domain: str, info: dict[str, str]) -> typing.Optional[str]:
+def linkcode_resolve(repo_link: str, domain: str, info: dict[str, str]) -> str | None:
     """
     Function called by linkcode to get the URL for a given resource.
 
@@ -79,8 +78,7 @@ def linkcode_resolve(repo_link: str, domain: str, info: dict[str, str]) -> typin
             # This could be caused by trying to link a class attribute
             if is_attribute(symbol[-1], name):
                 break
-            else:
-                raise e
+            raise e
 
         symbol_name = name
 
@@ -97,8 +95,8 @@ def linkcode_resolve(repo_link: str, domain: str, info: dict[str, str]) -> typin
         pos = _global_assign_pos(source, symbol_name)
         if pos is None:
             raise Exception(f"Could not find symbol `{symbol_name}` in {module.__name__}.")
-        else:
-            start, end = pos
+
+        start, end = pos
         _, offset = inspect.getsourcelines(symbol[-2])
         if offset != 0:
             offset -= 1
@@ -126,7 +124,7 @@ class NodeWithBody(typing.Protocol):
     body: list[ast.AST]
 
 
-def _global_assign_pos(ast_: NodeWithBody, name: str) -> typing.Union[tuple[int, int], None]:
+def _global_assign_pos(ast_: NodeWithBody, name: str) -> tuple[int, int] | None:
     """
     Find the first instance where the `name` global is defined in `ast_`.
 
@@ -149,6 +147,7 @@ def _global_assign_pos(ast_: NodeWithBody, name: str) -> typing.Union[tuple[int,
             pos_in_if = _global_assign_pos(ast_obj, name)
             if pos_in_if is not None:
                 return pos_in_if
+    return None
 
 
 def cleanup() -> None:
@@ -200,7 +199,7 @@ def build_api_doc() -> None:
         logger.info(f"Skipping api-doc for {output_folder.as_posix()} as it already exists.")
         return
 
-    result = subprocess.run(cmd, cwd=build_root, stdout=subprocess.PIPE, check=True, env=os.environ)
+    result = subprocess.run(cmd, cwd=build_root, stdout=subprocess.PIPE, check=True, env=os.environ)  # noqa: S603
     logger.debug("api-doc Output:\n" + result.stdout.decode(encoding="utf-8") + "\n")
 
     cleanup()

pydis_core/__init__.py

@@ -12,4 +12,4 @@
     StartupError,
 ]
 
-__all__ = list(map(lambda module: module.__name__, __all__))
+__all__ = [module.__name__ for module in __all__]

pydis_core/_bot.py

@@ -3,7 +3,6 @@
 import types
 import warnings
 from contextlib import suppress
-from typing import Optional
 
 import aiohttp
 import discord
@@ -19,7 +18,7 @@
     from async_rediscache import RedisSession
     REDIS_AVAILABLE = True
 except ImportError:
-    RedisSession = None
+    RedisSession = object
     REDIS_AVAILABLE = False
 
 log = get_logger()
@@ -42,9 +41,9 @@ def __init__(
         guild_id: int,
         allowed_roles: list,
         http_session: aiohttp.ClientSession,
-        redis_session: Optional[RedisSession] = None,
-        api_client: Optional[APIClient] = None,
-        statsd_url: Optional[str] = None,
+        redis_session: RedisSession | None = None,
+        api_client: APIClient | None = None,
+        statsd_url: str | None = None,
         **kwargs,
     ):
         """
@@ -77,16 +76,16 @@ def __init__(
         elif redis_session:
             self.redis_session = redis_session
 
-        self._resolver: Optional[aiohttp.AsyncResolver] = None
-        self._connector: Optional[aiohttp.TCPConnector] = None
+        self._resolver: aiohttp.AsyncResolver | None = None
+        self._connector: aiohttp.TCPConnector | None = None
 
-        self._statsd_timerhandle: Optional[asyncio.TimerHandle] = None
-        self._guild_available: Optional[asyncio.Event] = None
+        self._statsd_timerhandle: asyncio.TimerHandle | None = None
+        self._guild_available: asyncio.Event | None = None
         self._extension_loading_task: asyncio.Task | None = None
 
-        self.stats: Optional[AsyncStatsClient] = None
+        self.stats: AsyncStatsClient | None = None
 
-        self.all_extensions: Optional[frozenset[str]] = None
+        self.all_extensions: frozenset[str] | None = None
 
     def _connect_statsd(
         self,
@@ -176,7 +175,7 @@ def add_command(self, command: commands.Command) -> None:
         super().add_command(command)
         self._add_root_aliases(command)
 
-    def remove_command(self, name: str) -> Optional[commands.Command]:
+    def remove_command(self, name: str) -> commands.Command | None:
         """
         Remove a command/alias as normal and then remove its root aliases from the bot.
 

pydis_core/async_stats.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import socket
-from typing import Optional
 
 from statsd.client.base import StatsClientBase
 
@@ -15,7 +14,7 @@ class AsyncStatsClient(StatsClientBase):
     def __init__(
         self,
         loop: asyncio.AbstractEventLoop,
-        host: str = 'localhost',
+        host: str = "localhost",
         port: int = 8125,
         prefix: str = None
     ):
@@ -35,7 +34,7 @@ def __init__(
         self._addr = addr
         self._prefix = prefix
         self._loop = loop
-        self._transport: Optional[asyncio.DatagramTransport] = None
+        self._transport: asyncio.DatagramTransport | None = None
 
     async def create_socket(self) -> None:
         """Use :obj:`asyncio.loop.create_datagram_endpoint` from the loop given on init to create a socket."""
@@ -51,7 +50,7 @@ def _send(self, data: str) -> None:
 
     async def _async_send(self, data: str) -> None:
         """Send data to the statsd server using the async transport."""
-        self._transport.sendto(data.encode('ascii'), self._addr)
+        self._transport.sendto(data.encode("ascii"), self._addr)
 
 
-__all__ = ['AsyncStatsClient']
+__all__ = ["AsyncStatsClient"]

pydis_core/exts/__init__.py

@@ -1,4 +1,4 @@
 """Reusable Discord cogs."""
 __all__ = []
 
-__all__ = list(map(lambda module: module.__name__, __all__))
+__all__ = [module.__name__ for module in __all__]