|
@@ -13,6 +13,8 @@
|
|
|
# See the License for the specific language governing permissions and
|
|
|
# limitations under the License.
|
|
|
|
|
|
+import six
|
|
|
+
|
|
|
from synapse.storage import DataStore
|
|
|
from synapse.storage.end_to_end_keys import EndToEndKeyStore
|
|
|
from synapse.util.caches.stream_change_cache import StreamChangeCache
|
|
@@ -21,6 +23,13 @@ from ._base import BaseSlavedStore
|
|
|
from ._slaved_id_tracker import SlavedIdTracker
|
|
|
|
|
|
|
|
|
+def __func__(inp):
|
|
|
+ if six.PY3:
|
|
|
+ return inp
|
|
|
+ else:
|
|
|
+ return inp.__func__
|
|
|
+
|
|
|
+
|
|
|
class SlavedDeviceStore(BaseSlavedStore):
|
|
|
def __init__(self, db_conn, hs):
|
|
|
super(SlavedDeviceStore, self).__init__(db_conn, hs)
|
|
@@ -38,14 +47,14 @@ class SlavedDeviceStore(BaseSlavedStore):
|
|
|
"DeviceListFederationStreamChangeCache", device_list_max,
|
|
|
)
|
|
|
|
|
|
- get_device_stream_token = DataStore.get_device_stream_token.__func__
|
|
|
- get_user_whose_devices_changed = DataStore.get_user_whose_devices_changed.__func__
|
|
|
- get_devices_by_remote = DataStore.get_devices_by_remote.__func__
|
|
|
- _get_devices_by_remote_txn = DataStore._get_devices_by_remote_txn.__func__
|
|
|
- _get_e2e_device_keys_txn = DataStore._get_e2e_device_keys_txn.__func__
|
|
|
- mark_as_sent_devices_by_remote = DataStore.mark_as_sent_devices_by_remote.__func__
|
|
|
+ get_device_stream_token = __func__(DataStore.get_device_stream_token)
|
|
|
+ get_user_whose_devices_changed = __func__(DataStore.get_user_whose_devices_changed)
|
|
|
+ get_devices_by_remote = __func__(DataStore.get_devices_by_remote)
|
|
|
+ _get_devices_by_remote_txn = __func__(DataStore._get_devices_by_remote_txn)
|
|
|
+ _get_e2e_device_keys_txn = __func__(DataStore._get_e2e_device_keys_txn)
|
|
|
+ mark_as_sent_devices_by_remote = __func__(DataStore.mark_as_sent_devices_by_remote)
|
|
|
_mark_as_sent_devices_by_remote_txn = (
|
|
|
- DataStore._mark_as_sent_devices_by_remote_txn.__func__
|
|
|
+ __func__(DataStore._mark_as_sent_devices_by_remote_txn)
|
|
|
)
|
|
|
count_e2e_one_time_keys = EndToEndKeyStore.__dict__["count_e2e_one_time_keys"]
|
|
|
|