Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin

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