diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-05-18 10:45:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 10:45:30 +0100 |
| commit | 4d1afb1dfe678898322479e229b3d51cc33c3fd2 (patch) | |
| tree | 0aa0009fc0f1c8ca09f4379810ac71a34e0ee775 /synapse/replication/slave/storage/presence.py | |
| parent | fix mypy for tests/replication (#7518) (diff) | |
| parent | changelog (diff) | |
| download | synapse-4d1afb1dfe678898322479e229b3d51cc33c3fd2.tar.xz | |
Merge pull request #7519 from matrix-org/rav/kill_py2_code
Kill off some old python 2 code
Diffstat (limited to 'synapse/replication/slave/storage/presence.py')
| -rw-r--r-- | synapse/replication/slave/storage/presence.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/replication/slave/storage/presence.py b/synapse/replication/slave/storage/presence.py index bd79ba99be..4e0124842d 100644 --- a/synapse/replication/slave/storage/presence.py +++ b/synapse/replication/slave/storage/presence.py @@ -18,7 +18,7 @@ from synapse.storage.data_stores.main.presence import PresenceStore from synapse.storage.database import Database from synapse.util.caches.stream_change_cache import StreamChangeCache -from ._base import BaseSlavedStore, __func__ +from ._base import BaseSlavedStore from ._slaved_id_tracker import SlavedIdTracker @@ -27,14 +27,14 @@ class SlavedPresenceStore(BaseSlavedStore): super(SlavedPresenceStore, self).__init__(database, db_conn, hs) self._presence_id_gen = SlavedIdTracker(db_conn, "presence_stream", "stream_id") - self._presence_on_startup = self._get_active_presence(db_conn) + self._presence_on_startup = self._get_active_presence(db_conn) # type: ignore self.presence_stream_cache = StreamChangeCache( "PresenceStreamChangeCache", self._presence_id_gen.get_current_token() ) - _get_active_presence = __func__(DataStore._get_active_presence) - take_presence_startup_info = __func__(DataStore.take_presence_startup_info) + _get_active_presence = DataStore._get_active_presence + take_presence_startup_info = DataStore.take_presence_startup_info _get_presence_for_user = PresenceStore.__dict__["_get_presence_for_user"] get_presence_for_users = PresenceStore.__dict__["get_presence_for_users"] |