summary refs log tree commit diff
path: root/synapse/storage/transactions.py
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-05-29 17:42:43 +0200
committerAdrian Tschira <nota@notafile.com>2018-05-29 17:42:43 +0200
commit4b9d0cde97495cee16f650f7625c89339a24230c (patch)
tree13d7cc15e40f0d3c94223f7f0ea9d350b49f9b0f /synapse/storage/transactions.py
parentuse memoryview in py3 (diff)
downloadsynapse-4b9d0cde97495cee16f650f7625c89339a24230c.tar.xz
add remaining memoryview changes
Diffstat (limited to '')
-rw-r--r--synapse/storage/transactions.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py

index f825264ea9..e485d19b84 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py
@@ -17,6 +17,7 @@ from ._base import SQLBaseStore from synapse.util.caches.descriptors import cached from twisted.internet import defer +import six from canonicaljson import encode_canonical_json @@ -25,6 +26,13 @@ from collections import namedtuple import logging import simplejson as 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 +else: + db_binary_type = memoryview + logger = logging.getLogger(__name__) @@ -110,7 +118,7 @@ class TransactionStore(SQLBaseStore): "transaction_id": transaction_id, "origin": origin, "response_code": code, - "response_json": buffer(encode_canonical_json(response_dict)), + "response_json": db_binary_type(encode_canonical_json(response_dict)), "ts": self._clock.time_msec(), }, or_ignore=True,