diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-04-27 13:13:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 13:13:07 +0100 |
| commit | fe604a022a7142157da7e90a40330beb2a11af7a (patch) | |
| tree | d0e20b355e5e9b532665651daa52eb096310baa4 /synapse/storage/_base.py | |
| parent | Pass errors back to the client when trying multiple federation destinations. ... (diff) | |
| download | synapse-fe604a022a7142157da7e90a40330beb2a11af7a.tar.xz | |
Remove various bits of compatibility code for Python <3.6 (#9879)
I went through and removed a bunch of cruft that was lying around for compatibility with old Python versions. This PR also will now prevent Synapse from starting unless you're running Python 3.6+.
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index d472676acf..6b68d8720c 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -114,7 +114,7 @@ def db_to_json(db_content: Union[memoryview, bytes, bytearray, str]) -> Any: db_content = db_content.tobytes() # Decode it to a Unicode string before feeding it to the JSON decoder, since - # Python 3.5 does not support deserializing bytes. + # it only supports handling strings if isinstance(db_content, (bytes, bytearray)): db_content = db_content.decode("utf8") |