Update update_query calls to work with latest yarl (#7260)

danigm · Dreamsorcerer · web-flow · commit 2be9318dc95a · 2023-05-02T20:28:50.000+01:00
This patch pass "{}" when params is "None" to the url.update_query to avoid setting the url params to None. Related to this change in yarl: aio-libs/yarl@dd86b34 Fix #7259 --------- Co-authored-by: Sam Bull <aa6bs0@sambull.org>
diff --git a/CHANGES/7259.bugfix b/CHANGES/7259.bugfix
@@ -0,0 +1 @@
+Fixed missing query in tracing method URLs when using ``yarl`` 1.9+.
diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -374,6 +374,7 @@ async def _request(
         redirects = 0
         history = []
         version = self._version
+        params = params or {}
 
         # Merge with default headers and transform to CIMultiDict
         headers = self._prepare_headers(headers)
@@ -613,7 +614,7 @@ async def _request(
                             headers.pop(hdrs.AUTHORIZATION, None)
 
                         url = parsed_url
-                        params = None
+                        params = {}
                         resp.release()
                         continue
 
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -11,4 +11,4 @@ charset-normalizer==2.0.12
 frozenlist==1.3.1
 gunicorn==20.1.0
 uvloop==0.14.0; platform_system!="Windows" and implementation_name=="cpython" and python_version<"3.9" # MagicStack/uvloop#14
-yarl==1.8.1
+yarl==1.9.2
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -253,7 +253,7 @@ webcolors==1.11.1
     # via blockdiag
 wheel==0.37.0
     # via pip-tools
-yarl==1.8.1
+yarl==1.9.2
     # via -r requirements/base.txt
 zipp==3.8.1
     # via importlib-metadata

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed missing query in tracing method URLs when using ``yarl`` 1.9+.