From 6910f0c38e98b31d17dd2f3eb8b2fb75d15705dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Mon, 15 May 2023 15:27:26 +0200
Subject: [PATCH] Backport upstream patch to fix a test failing with
 python-yarl 1.9.2

---
 ...query-calls-to-work-with-latest-yarl.patch | 33 +++++++++++++++++++
 python-aiohttp.spec                           | 10 +++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 Update-update_query-calls-to-work-with-latest-yarl.patch

diff --git a/Update-update_query-calls-to-work-with-latest-yarl.patch b/Update-update_query-calls-to-work-with-latest-yarl.patch
new file mode 100644
index 0000000..de0c45d
--- /dev/null
+++ b/Update-update_query-calls-to-work-with-latest-yarl.patch
@@ -0,0 +1,33 @@
+From 8afa163fba77b38de1c2356668f08a7c3b9d0b58 Mon Sep 17 00:00:00 2001
+From: danigm <daniel.garcia@suse.com>
+Date: Mon, 15 May 2023 15:20:35 +0200
+Subject: [PATCH] Update update_query calls to work with latest yarl
+
+---
+ aiohttp/client.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aiohttp/client.py b/aiohttp/client.py
+index 0d0f4c1..56ec740 100644
+--- a/aiohttp/client.py
++++ b/aiohttp/client.py
+@@ -414,6 +414,7 @@ class ClientSession:
+         redirects = 0
+         history = []
+         version = self._version
++        params = params or {}
+ 
+         # Merge with default headers and transform to CIMultiDict
+         headers = self._prepare_headers(headers)
+@@ -630,7 +631,7 @@ class ClientSession:
+                             headers.pop(hdrs.AUTHORIZATION, None)
+ 
+                         url = parsed_url
+-                        params = None
++                        params = {}
+                         resp.release()
+                         continue
+ 
+-- 
+2.40.1
+
diff --git a/python-aiohttp.spec b/python-aiohttp.spec
index 467fb74..47e0861 100644
--- a/python-aiohttp.spec
+++ b/python-aiohttp.spec
@@ -2,7 +2,7 @@
 
 Name:           python-aiohttp
 Version:        3.8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python HTTP client/server for asyncio
 
 License:        Apache-2.0
@@ -20,6 +20,11 @@ Patch:          0001-Unbundle-llhttp.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2158175
 Patch:          %{url}/pull/7178.patch
 
+# Update update_query calls to work with latest yarl (1.9.2)
+# Patch was inspired by this upstream commit:
+# https://github.com/aio-libs/aiohttp/commit/2be9318
+Patch:          Update-update_query-calls-to-work-with-latest-yarl.patch
+
 BuildRequires:  gcc
 
 BuildRequires:  llhttp-devel
@@ -140,6 +145,9 @@ k="${k-}${k+ and }not test_tcp_connector_fingerprint_fail[pyloop]"
 %doc README.rst
 
 %changelog
+* Mon May 15 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.8.4-2
+- Backport upstream patch to fix a test failing with python-yarl 1.9.2
+
 * Mon Feb 13 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 3.8.4-1
 - Update to 3.8.4 (close RHBZ#2169212)