Merge pull request #871 from camptocamp/dependabot/pip/mypy-0.800

Bump mypy from 0.790 to 0.800

Pipfile

@@ -8,7 +8,7 @@ astroid = "==2.3.3"
 bandit = "==1.7.0"
 coverage = "==5.4"
 junit2html = "==30.0.4"
-mypy = "==0.790"
+mypy = "==0.812"
 prospector = "==1.2.0"
 pycodestyle = "==2.4.0"
 pyflakes = "==2.1.1"

c2cwsgiutils/broadcast/redis.py

@@ -6,7 +6,7 @@
 import time
 from typing import Any, Callable, List, Mapping, Optional
 
-import redis
+import redis  # pylint: disable=unused-import
 
 from c2cwsgiutils.broadcast import interface, local, utils
 
@@ -18,7 +18,12 @@ class RedisBroadcaster(interface.BaseBroadcaster):
     Implement broadcasting messages using Redis
     """
 
-    def __init__(self, broadcast_prefix: str, master: redis.Redis, slave: redis.Redis) -> None:
+    def __init__(
+        self,
+        broadcast_prefix: str,
+        master: "redis.client.Redis[str]",  # pylint: disable=unsubscriptable-object
+        slave: "redis.client.Redis[str]",  # pylint: disable=unsubscriptable-object
+    ) -> None:
         from c2cwsgiutils import redis_utils
 
         self._master = master

c2cwsgiutils/redis_utils.py

@@ -24,14 +24,18 @@
 REDIS_SERVICENAME_KEY_PROP = "c2c.redis_servicename"
 REDIS_DB_KEY_PROP = "c2c.redis_db"
 
-_master: Optional[redis.Redis] = None
-_slave: Optional[redis.Redis] = None
+_master: Optional["redis.client.Redis[str]"] = None  # pylint: disable=unsubscriptable-object
+_slave: Optional["redis.client.Redis[str]"] = None  # pylint: disable=unsubscriptable-object
 _sentinel: Optional[redis.sentinel.Sentinel] = None
 
 
 def get(
-    settings: Optional[Mapping[str, Any]] = None,
-) -> Tuple[Optional[redis.Redis], Optional[redis.Redis], Optional[redis.sentinel.Sentinel]]:
+    settings: Optional[Mapping[str, bytes]] = None,
+) -> Tuple[
+    Optional["redis.client.Redis[str]"],  # pylint: disable=unsubscriptable-object
+    Optional["redis.client.Redis[str]"],  # pylint: disable=unsubscriptable-object
+    Optional[redis.sentinel.Sentinel],
+]:
     if _master is None:
         _init(settings)
     return _master, _slave, _sentinel
@@ -82,7 +86,7 @@ def _init(settings: Optional[Mapping[str, Any]]) -> None:
             url = "redis://" + url
 
         LOG.info("Redis setup using: %s, with options: %s", url, redis_options_)
-        _master = redis.Redis.from_url(url, decode_responses=True, **redis_options)
+        _master = redis.client.Redis.from_url(url, decode_responses=True, **redis_options)
         _slave = _master
     else:
         LOG.info(