summary refs log tree commit diff
path: root/synapse/util/stringutils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-24 09:57:49 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-24 09:57:49 +0100
commitbe777e325dedab1ee84e5bbd96f7571b8490a8ec (patch)
tree16fd1b1a1b15bba5f5e78037ddada7525ae8b653 /synapse/util/stringutils.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentDowngrade warning on client disconnect to INFO (#7928) (diff)
downloadsynapse-be777e325dedab1ee84e5bbd96f7571b8490a8ec.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/stringutils.py')
-rw-r--r--synapse/util/stringutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py

index 08c86e92b8..2e2b40a426 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py
@@ -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