summary refs log tree commit diff
path: root/synapse/storage/data_stores/main/presence.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 11:36:45 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 11:36:45 +0000
commitf7fb31d200f7cfc6fb922368f06bafadcfb9d087 (patch)
tree26a41126ba5e3de6035a741456d95bf1ee2751f4 /synapse/storage/data_stores/main/presence.py
parentDelegate remote_user_id mapping to the saml mapping provider (#6723) (diff)
parentMerge pull request #6724 from matrix-org/rav/log_saml_attributes (diff)
downloadsynapse-f7fb31d200f7cfc6fb922368f06bafadcfb9d087.tar.xz
Merge pull request #6724 from matrix-org/rav/log_saml_attributes
* commit '59dc87c61':
  changelog
  Log saml assertions rather than the whole response
  move batch_iter to a separate module
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):