Importing ABC directly from collections will be removed in Python 3.10

[tirkarthi]

Description

Importing ABC directly from collections will be removed in Python 3.10. Use collections.abc instead.

synapse/replication/tcp/streams/events.py
17:from collections import Iterable

synapse/events/utils.py
427:    if not isinstance(old_power_levels, collections.Mapping):
437:        if isinstance(v, collections.Mapping):

synapse/util/stringutils.py
20:from collections import Iterable

synapse/handlers/federation.py
22:from collections import Container

[anoadragon453]

Good spot, thanks. Curious if you're using pyupgrade, as you mentioned in another issue, to spot these?

[tirkarthi]

No, I am using a custom regex here to find all instances and fix them manually. Pyupgrade doesn't support fixing these.

[tirkarthi]

The command is as below with rg being ripgrep :

rg  -t py -i 'time.clock|encodestring|decodestring|celementtree|collections.*(Awaitable|Coroutine|AsyncIterable|AsyncIterator|AsyncGenerator|Hashable|Iterable|Iterator|Generator|Reversible|Sized|Container|Callable|Collection|Set|MutableSet|Mapping|MutableMapping|MappingView|KeysView|ItemsView|ValuesView|Sequence|MutableSequence|ByteString)|asyncio.?coroutine|isAlive|readfp'