Fix deprecation warning: import ABC from collections.abc (#7892)

pull/7919/head
Karthikeyan Singaravelan 2020-07-20 23:03:04 +05:30 committed by GitHub
parent 5ecf98f59e
commit a7b06a81f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions

1
changelog.d/7892.misc Normal file
View File

@ -0,0 +1 @@
Import ABC from `collections.abc` for Python 3.10 compatibility.

View File

@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import collections
import collections.abc
import re
from typing import Any, Mapping, Union
@ -424,7 +424,7 @@ def copy_power_levels_contents(
Raises:
TypeError if the input does not look like a valid power levels event content
"""
if not isinstance(old_power_levels, collections.Mapping):
if not isinstance(old_power_levels, collections.abc.Mapping):
raise TypeError("Not a valid power-levels content: %r" % (old_power_levels,))
power_levels = {}
@ -434,7 +434,7 @@ def copy_power_levels_contents(
power_levels[k] = v
continue
if isinstance(v, collections.Mapping):
if isinstance(v, collections.abc.Mapping):
power_levels[k] = h = {}
for k1, v1 in v.items():
# we should only have one level of nesting

View File

@ -19,7 +19,7 @@
import itertools
import logging
from collections import Container
from collections.abc import Container
from http import HTTPStatus
from typing import Dict, Iterable, List, Optional, Sequence, Tuple, Union

View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import heapq
from collections import Iterable
from collections.abc import Iterable
from typing import List, Tuple, Type
import attr

View File

@ -17,7 +17,7 @@ import itertools
import random
import re
import string
from collections import Iterable
from collections.abc import Iterable
from synapse.api.errors import Codes, SynapseError