[PR #8098/aca206fc backport][3.9] Fix backwards compatibility with ssl (

#8101) **This is a backport of PR #8098 as merged into 3.10 (aca206f).** Fixes #8097. Co-authored-by: Sam Bull <[email protected]>
aio-libs · Jan 29, 2024 · 5637e8f · 5637e8f
1 parent 33f49e8
commit 5637e8f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES/8097.bugfix.rst b/CHANGES/8097.bugfix.rst
@@ -0,0 +1 @@
+8098.bugfix.rst
diff --git a/CHANGES/8098.bugfix.rst b/CHANGES/8098.bugfix.rst
@@ -0,0 +1,2 @@
+Fixed backwards compatibility breakage of ``ssl`` parameter when set outside of
+``ClientSession`` (e.g. directly in ``TCPConnector``) -- by :user:`Dreamsorcerer`.
diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py
@@ -159,6 +159,8 @@ def _merge_ssl_params(
     ssl_context: Optional["SSLContext"],
     fingerprint: Optional[bytes],
 ) -> Union["SSLContext", bool, Fingerprint]:
+    if ssl is None:
+        ssl = True  # Double check for backwards compatibility
     if verify_ssl is not None and not verify_ssl:
         warnings.warn(
             "verify_ssl is deprecated, use ssl=False instead",

diff --git a/tests/test_connector.py b/tests/test_connector.py
@@ -2001,6 +2001,11 @@ async def test_default_use_dns_cache() -> None:
     assert conn.use_dns_cache
 
 
+async def test_ssl_none() -> None:
+    conn = aiohttp.TCPConnector(ssl=None)
+    assert conn._ssl is True
+
+
 async def test_resolver_not_called_with_address_is_ip(loop) -> None:
     resolver = mock.MagicMock()
     connector = aiohttp.TCPConnector(resolver=resolver)