make ssl module optional

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

redis/asyncio/client.py

@@ -2,7 +2,6 @@
 import copy
 import inspect
 import re
-import ssl
 import warnings
 from typing import (
     TYPE_CHECKING,
@@ -71,13 +70,21 @@
 from redis.typing import ChannelT, EncodableT, KeyT
 from redis.utils import (
     HIREDIS_AVAILABLE,
+    SSL_AVAILABLE,
     _set_info_logger,
     deprecated_function,
     get_lib_version,
     safe_str,
     str_if_bytes,
 )
 
+if SSL_AVAILABLE:
+    import ssl
+    from ssl import TLSVersion
+else:
+    ssl = None
+    TLSVersion = None
+
 PubSubHandler = Callable[[Dict[str, str]], Awaitable[None]]
 _KeyT = TypeVar("_KeyT", bound=KeyT)
 _ArgT = TypeVar("_ArgT", KeyT, EncodableT)
@@ -227,7 +234,7 @@ def __init__(
         ssl_ca_certs: Optional[str] = None,
         ssl_ca_data: Optional[str] = None,
         ssl_check_hostname: bool = False,
-        ssl_min_version: Optional[ssl.TLSVersion] = None,
+        ssl_min_version: Optional[TLSVersion] = None,
         max_connections: Optional[int] = None,
         single_connection_client: bool = False,
         health_check_interval: int = 0,

redis/asyncio/cluster.py

@@ -2,7 +2,6 @@
 import collections
 import random
 import socket
-import ssl
 import warnings
 from typing import (
     Any,
@@ -70,13 +69,21 @@
 )
 from redis.typing import AnyKeyT, EncodableT, KeyT
 from redis.utils import (
+    SSL_AVAILABLE,
     deprecated_function,
     dict_merge,
     get_lib_version,
     safe_str,
     str_if_bytes,
 )
 
+if SSL_AVAILABLE:
+    import ssl
+    from ssl import TLSVersion
+else:
+    ssl = None
+    TLSVersion = None
+
 TargetNodesT = TypeVar(
     "TargetNodesT", str, "ClusterNode", List["ClusterNode"], Dict[Any, "ClusterNode"]
 )
@@ -272,7 +279,7 @@ def __init__(
         ssl_certfile: Optional[str] = None,
         ssl_check_hostname: bool = False,
         ssl_keyfile: Optional[str] = None,
-        ssl_min_version: Optional[ssl.TLSVersion] = None,
+        ssl_min_version: Optional[TLSVersion] = None,
         protocol: Optional[int] = 2,
         address_remap: Optional[Callable[[str, int], Tuple[str, int]]] = None,
         cache_enabled: bool = False,

redis/asyncio/connection.py

@@ -30,11 +30,12 @@
 
 if SSL_AVAILABLE:
     import ssl
-    from ssl import SSLContext
+    from ssl import SSLContext, TLSVersion
 
 else:
     ssl = None
     SSLContext = None
+    TLSVersion = None
 
 # the functionality is available in 3.11.x but has a major issue before
 # 3.11.3. See https://github.com/redis/redis-py/issues/2633
@@ -832,7 +833,7 @@ def __init__(
         ssl_ca_certs: Optional[str] = None,
         ssl_ca_data: Optional[str] = None,
         ssl_check_hostname: bool = False,
-        ssl_min_version: Optional[ssl.TLSVersion] = None,
+        ssl_min_version: Optional[TLSVersion] = None,
         **kwargs,
     ):
         if not SSL_AVAILABLE:
@@ -903,7 +904,7 @@ def __init__(
         ca_certs: Optional[str] = None,
         ca_data: Optional[str] = None,
         check_hostname: bool = False,
-        min_version: Optional[ssl.TLSVersion] = None,
+        min_version: Optional[TLSVersion] = None,
     ):
         if not SSL_AVAILABLE:
             raise RedisError("Python wasn't built with SSL support")
@@ -927,7 +928,7 @@ def __init__(
         self.ca_data = ca_data
         self.check_hostname = check_hostname
         self.min_version = min_version
-        self.context: Optional[ssl.SSLContext] = None
+        self.context: Optional[SSLContext] = None
 
     def get(self) -> SSLContext:
         if not self.context: