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/transactions.py b/synapse/storage/transactions.py

index a3032cdce9..d8bf953ec0 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -30,7 +30,7 @@ from ._base import SQLBaseStore, db_to_json
 # py2 sqlite has buffer hardcoded as only binary type, so we must use it,
 # despite being deprecated and removed in favor of memoryview
 if six.PY2:
-    db_binary_type = buffer
+    db_binary_type = six.moves.builtins.buffer
 else:
     db_binary_type = memoryview