From 54f5604cafb4a08ea9e94e12de69e5adae51c42b Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 15 Mar 2024 15:19:18 -0700 Subject: [PATCH] Fixed cookies= httpx warning, refs #2307 --- datasette/app.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/datasette/app.py b/datasette/app.py index c0b14fb2..f1b057af 100644 --- a/datasette/app.py +++ b/datasette/app.py @@ -1935,50 +1935,58 @@ class DatasetteClient: async def get(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.get(self._fix(path), **kwargs) async def options(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.options(self._fix(path), **kwargs) async def head(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.head(self._fix(path), **kwargs) async def post(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.post(self._fix(path), **kwargs) async def put(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.put(self._fix(path), **kwargs) async def patch(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.patch(self._fix(path), **kwargs) async def delete(self, path, **kwargs): async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.delete(self._fix(path), **kwargs) async def request(self, method, path, **kwargs): avoid_path_rewrites = kwargs.pop("avoid_path_rewrites", None) async with httpx.AsyncClient( - transport=httpx.ASGITransport(app=self.app) + transport=httpx.ASGITransport(app=self.app), + cookies=kwargs.pop("cookies", None), ) as client: return await client.request( method, self._fix(path, avoid_path_rewrites), **kwargs