diff options
author | Adrian Tschira <nota@notafile.com> | 2018-05-29 17:10:06 +0200 |
---|---|---|
committer | Adrian Tschira <nota@notafile.com> | 2018-05-29 17:14:34 +0200 |
commit | 1afafb34978726b63c2a02520ff20d85382ce2bc (patch) | |
tree | c3ff3cccba905fe43117fe413d247b23e67d4c49 /synapse/storage/keys.py | |
parent | Merge pull request #3299 from matrix-org/matthew/macos-fixes (diff) | |
download | synapse-1afafb34978726b63c2a02520ff20d85382ce2bc.tar.xz |
use memoryview in py3
Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r-- | synapse/storage/keys.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index 0540c2b0b1..e56c464852 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -17,6 +17,7 @@ from ._base import SQLBaseStore from synapse.util.caches.descriptors import cachedInlineCallbacks from twisted.internet import defer +import six import OpenSSL from signedjson.key import decode_verify_key_bytes @@ -26,6 +27,13 @@ import logging logger = logging.getLogger(__name__) +# 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 + class KeyStore(SQLBaseStore): """Persistence for signature verification keys and tls X.509 certificates |