diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-20 11:16:55 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 11:16:55 +1100 |
commit | e1728dfcbe585edfb590bce50adeaab341a70db8 (patch) | |
tree | 0ae215c46f15ecc917bf45d75430298a003b0e27 /synapse/storage/_base.py | |
parent | Merge branch 'rav/fix_email_templates_4065' into develop (diff) | |
download | synapse-e1728dfcbe585edfb590bce50adeaab341a70db8.tar.xz |
Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on py3) (#4068)
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index be61147b9b..d9d0255d0b 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -18,7 +18,7 @@ import threading import time from six import PY2, iteritems, iterkeys, itervalues -from six.moves import intern, range +from six.moves import builtins, intern, range from canonicaljson import json from prometheus_client import Histogram @@ -1233,7 +1233,7 @@ def db_to_json(db_content): # psycopg2 on Python 2 returns buffer objects, which we need to cast to # bytes to decode - if PY2 and isinstance(db_content, buffer): + if PY2 and isinstance(db_content, builtins.buffer): db_content = bytes(db_content) # Decode it to a Unicode string before feeding it to json.loads, so we |