summary refs log tree commit diff
path: root/synapse/storage/pusher.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-10-22 22:18:02 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2018-10-22 22:18:02 +1100
commitead471e72df700036a3085c2403cf2307f08d2d8 (patch)
tree833f31c14824e339fe038bfd5713dfb639288be5 /synapse/storage/pusher.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentuh, Matrix is called Matrix these days... (diff)
downloadsynapse-ead471e72df700036a3085c2403cf2307f08d2d8.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/pusher.py')
-rw-r--r--synapse/storage/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py

index c7987bfcdd..2743b52bad 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py
@@ -29,7 +29,7 @@ from ._base import SQLBaseStore logger = logging.getLogger(__name__) if six.PY2: - db_binary_type = buffer + db_binary_type = six.moves.builtins.buffer else: db_binary_type = memoryview