Merge branch 'master' into resolve-some-docs-warnings

CHANGES

@@ -65,6 +65,7 @@
     * Add `sum` to DUPLICATE_POLICY documentation of `TS.CREATE`, `TS.ADD` and `TS.ALTER`
     * Prevent async ClusterPipeline instances from becoming "false-y" in case of empty command stack (#3061)
     * Close Unix sockets if the connection attempt fails. This prevents `ResourceWarning`s. (#3314)
+    * Close SSL sockets if the connection attempt fails, or if validations fail. (#3317)
 
 * 4.1.3 (Feb 8, 2022)
   * Fix flushdb and flushall (#1926)

dev_requirements.txt

@@ -1,8 +1,8 @@
 black==24.3.0
 cachetools
 click==8.0.4
-flake8-isort==6.0.0
-flake8==5.0.4
+flake8-isort
+flake8
 flynt~=0.69.0
 invoke==2.2.0
 mock

redis/_parsers/helpers.py

@@ -507,7 +507,7 @@ def parse_geosearch_generic(response, **options):
     except KeyError:  # it means the command was sent via execute_command
         return response
 
-    if type(response) != list:
+    if not isinstance(response, list):
         response_list = [response]
     else:
         response_list = response

redis/commands/core.py

@@ -1381,9 +1381,6 @@ def failover(self):
         )
 
 
-AsyncManagementCommands = ManagementCommands
-
-
 class AsyncManagementCommands(ManagementCommands):
     async def command_info(self, **kwargs) -> None:
         return super().command_info(**kwargs)

redis/commands/timeseries/info.py

@@ -78,7 +78,7 @@ def __init__(self, args):
             self.chunk_size = response["chunkSize"]
         if "duplicatePolicy" in response:
             self.duplicate_policy = response["duplicatePolicy"]
-            if type(self.duplicate_policy) == bytes:
+            if isinstance(self.duplicate_policy, bytes):
                 self.duplicate_policy = self.duplicate_policy.decode()
 
     def get(self, item):

redis/connection.py

@@ -819,7 +819,7 @@ def _connect(self):
         sock = super()._connect()
         try:
             return self._wrap_socket_with_ssl(sock)
-        except OSError:
+        except (OSError, RedisError):
             sock.close()
             raise
 
@@ -854,7 +854,6 @@ def _wrap_socket_with_ssl(self, sock):
             context.minimum_version = self.ssl_min_version
         if self.ssl_ciphers:
             context.set_ciphers(self.ssl_ciphers)
-        sslsock = context.wrap_socket(sock, server_hostname=self.host)
         if self.ssl_validate_ocsp is True and CRYPTOGRAPHY_AVAILABLE is False:
             raise RedisError("cryptography is not installed.")
 
@@ -864,6 +863,8 @@ def _wrap_socket_with_ssl(self, sock):
                 "- not both."
             )
 
+        sslsock = context.wrap_socket(sock, server_hostname=self.host)
+
         # validation for the stapled case
         if self.ssl_validate_ocsp_stapled:
             import OpenSSL

redis/typing.py

@@ -54,10 +54,8 @@
 class CommandsProtocol(Protocol):
     connection_pool: Union["AsyncConnectionPool", "ConnectionPool"]
 
-    def execute_command(self, *args, **options): ...
+    def execute_command(self, *args, **options) -> ResponseT: ...
 
 
-class ClusterCommandsProtocol(CommandsProtocol, Protocol):
+class ClusterCommandsProtocol(CommandsProtocol):
     encoder: "Encoder"
-
-    def execute_command(self, *args, **options) -> Union[Any, Awaitable]: ...

tests/test_asyncio/test_connection_pool.py

@@ -647,7 +647,6 @@ def test_connect_from_url_tcp(self):
         connection = redis.Redis.from_url("redis://localhost")
         pool = connection.connection_pool
 
-        print(repr(pool))
         assert re.match(
             r"< .*?([^\.]+) \( < .*?([^\.]+) \( (.+) \) > \) >", repr(pool), re.VERBOSE
         ).groups() == (

tests/test_asyncio/test_lock.py

@@ -237,4 +237,4 @@ def __init__(self, *args, **kwargs):
                 pass
 
         lock = r.lock("foo", lock_class=MyLock)
-        assert type(lock) == MyLock
+        assert isinstance(lock, MyLock)

tests/test_json.py

@@ -446,7 +446,6 @@ def test_json_forget_with_dollar(client):
     client.json().forget("not_a_document", "..a")
 
 
-@pytest.mark.onlynoncluster
 @pytest.mark.redismod
 def test_json_mget_dollar(client):
     # Test mget with multi paths

tests/test_lock.py

@@ -257,4 +257,4 @@ def __init__(self, *args, **kwargs):
                 pass
 
         lock = r.lock("foo", lock_class=MyLock)
-        assert type(lock) == MyLock
+        assert isinstance(lock, MyLock)