summary refs log tree commit diff
path: root/synapse/storage/data_stores/main/presence.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-17 10:33:24 +0000
committerGitHub <noreply@github.com>2020-01-17 10:33:24 +0000
commit59dc87c618861f9d353657b533f55f7e94c5ab37 (patch)
treea4dab2b9adfe77f82899e3714b199c1be01b4852 /synapse/storage/data_stores/main/presence.py
parentDelegate remote_user_id mapping to the saml mapping provider (#6723) (diff)
parentchangelog (diff)
downloadsynapse-59dc87c618861f9d353657b533f55f7e94c5ab37.tar.xz
Merge pull request #6724 from matrix-org/rav/log_saml_attributes
Log saml assertions rather than the whole response
Diffstat (limited to 'synapse/storage/data_stores/main/presence.py')
-rw-r--r--synapse/storage/data_stores/main/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/presence.py b/synapse/storage/data_stores/main/presence.py
index a2c83e0867..604c8b7ddd 100644
--- a/synapse/storage/data_stores/main/presence.py
+++ b/synapse/storage/data_stores/main/presence.py
@@ -17,8 +17,8 @@ from twisted.internet import defer
 
 from synapse.storage._base import SQLBaseStore, make_in_list_sql_clause
 from synapse.storage.presence import UserPresenceState
-from synapse.util import batch_iter
 from synapse.util.caches.descriptors import cached, cachedList
+from synapse.util.iterutils import batch_iter
 
 
 class PresenceStore(SQLBaseStore):