diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py
index d50b5dd346..70139beef2 100644
--- a/synapse/util/async_helpers.py
+++ b/synapse/util/async_helpers.py
@@ -284,15 +284,7 @@ async def yieldable_gather_results(
try:
return await make_deferred_yieldable(
defer.gatherResults(
- # type-ignore: mypy reports two errors:
- # error: Argument 1 to "run_in_background" has incompatible type
- # "Callable[[T, **P], Awaitable[R]]"; expected
- # "Callable[[T, **P], Awaitable[R]]" [arg-type]
- # error: Argument 2 to "run_in_background" has incompatible type
- # "T"; expected "[T, **P.args]" [arg-type]
- # The former looks like a mypy bug, and the latter looks like a
- # false positive.
- [run_in_background(func, item, *args, **kwargs) for item in iter], # type: ignore[arg-type]
+ [run_in_background(func, item, *args, **kwargs) for item in iter],
consumeErrors=True,
)
)
@@ -338,7 +330,7 @@ async def yieldable_gather_results_delaying_cancellation(
return await make_deferred_yieldable(
delay_cancellation(
defer.gatherResults(
- [run_in_background(func, item, *args, **kwargs) for item in iter], # type: ignore[arg-type]
+ [run_in_background(func, item, *args, **kwargs) for item in iter],
consumeErrors=True,
)
)
diff --git a/synapse/util/caches/dictionary_cache.py b/synapse/util/caches/dictionary_cache.py
index 4245b7289c..1e6696332f 100644
--- a/synapse/util/caches/dictionary_cache.py
+++ b/synapse/util/caches/dictionary_cache.py
@@ -229,7 +229,7 @@ class DictionaryCache(Generic[KT, DKT, DV]):
for dict_key in missing:
# We explicitly add each dict key to the cache, so that cache hit
# rates and LRU times for each key can be tracked separately.
- value = entry.get(dict_key, _Sentinel.sentinel) # type: ignore[arg-type]
+ value = entry.get(dict_key, _Sentinel.sentinel)
self.cache[(key, dict_key)] = _PerKeyValue(value)
if value is not _Sentinel.sentinel:
diff --git a/synapse/util/caches/expiringcache.py b/synapse/util/caches/expiringcache.py
index 462016f820..8017c031ee 100644
--- a/synapse/util/caches/expiringcache.py
+++ b/synapse/util/caches/expiringcache.py
@@ -142,7 +142,7 @@ class ExpiringCache(Generic[KT, VT]):
return default
if self.iterable:
- self.metrics.inc_evictions(EvictionReason.invalidation, len(value.value)) # type: ignore[arg-type]
+ self.metrics.inc_evictions(EvictionReason.invalidation, len(value.value))
else:
self.metrics.inc_evictions(EvictionReason.invalidation)
|
