diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
| commit | f7f487e14c553832a0accf0dcd09b546f9b4a702 (patch) | |
| tree | f6c28616c938cedecc18b7d8326cffa175c7395c /synapse/storage/pusher.py | |
| parent | isort (diff) | |
| parent | oops, run the check_isort build (diff) | |
| download | synapse-f7f487e14c553832a0accf0dcd09b546f9b4a702.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
Diffstat (limited to 'synapse/storage/pusher.py')
| -rw-r--r-- | synapse/storage/pusher.py | 2 |
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 |