Skip to content

Bump aiohttp from 3.9.5 to 3.10.2 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Bump aiohttp from 3.9.5 to 3.10.2 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b1e34
use httpx to read Sphinx inventory files
lmaotrigine Oct 2, 2024
6c3b03b
Bump aiohttp from 3.9.5 to 3.10.2
dependabot[bot] Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions cogs/rtfx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import asyncpg # type: ignore # rtfs
import discord
import httpx
from discord import app_commands, ui # type: ignore # rtfs
from discord.ext import commands, tasks # type: ignore # rtfs
from jishaku.codeblocks import Codeblock, codeblock_converter
Expand Down Expand Up @@ -143,6 +144,12 @@ class RTFX(commands.Cog):

def __init__(self, bot: Ayaka):
self.bot = bot
# aiohttp did something in 3.10 that RTD's Cloudflare protection doesn't
# like, so we use httpx for this.
self.httpx = httpx.AsyncClient()

async def cog_unload(self) -> None:
await self.httpx.aclose()

@property
def display_emoji(self) -> discord.PartialEmoji:
Expand Down Expand Up @@ -207,13 +214,13 @@ def parse_object_inv(self, stream: SphinxObjectFileReader, url: str) -> dict[str
async def build_rtfm_lookup_table(self) -> None:
cache = {}
for key, page in RTFM_PAGES.items():
_ = cache[key] = {}
async with self.bot.session.get(page + '/objects.inv') as resp:
if resp.status != 200:
raise RuntimeError('Cannot build rtfm lookup table, try again later.')

stream = SphinxObjectFileReader(await resp.read())
cache[key] = self.parse_object_inv(stream, page)
resp = await self.httpx.get(f'{page}/objects.inv')
if resp.status_code != 200:
raise RuntimeError('Cannot build rtfm lookup table, try again later.')
cache[key] = {}
stream = SphinxObjectFileReader(await resp.aread())
await resp.aclose()
cache[key] = self.parse_object_inv(stream, page)
self._rtfm_cache = cache

async def do_rtfm(self, ctx: Context, key: str, obj: str | None) -> None:
Expand Down
Loading
Loading