summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-15 14:56:52 +0000
committerGitHub <noreply@github.com>2019-01-15 14:56:52 +0000
commitaa955f2d15ae0367cd698d14788135a89272b297 (patch)
tree1a2d673ed17534cfcb75ec54dddf396a85fe5e4c
parentMerge branch 'release-v0.34.1.1' into develop (diff)
parentALL_USER_TYPES should be a tuple (diff)
downloadsynapse-aa955f2d15ae0367cd698d14788135a89272b297.tar.xz
Merge pull request #4392 from matrix-org/neilj/fix_user_type_typo
ALL_USER_TYPES should be a tuple
-rw-r--r--changelog.d/4392.bugfix1
-rw-r--r--synapse/api/constants.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4392.bugfix b/changelog.d/4392.bugfix
new file mode 100644
index 0000000000..2223f7dcd6
--- /dev/null
+++ b/changelog.d/4392.bugfix
@@ -0,0 +1 @@
+Fix typo in ALL_USER_TYPES definition to ensure type is a tuple
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 87bc1cb53d..022f772714 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -128,4 +128,4 @@ class UserTypes(object):
     'admin' and 'guest' users should also be UserTypes. Normal users are type None
     """
     SUPPORT = "support"
-    ALL_USER_TYPES = (SUPPORT)
+    ALL_USER_TYPES = (SUPPORT,)