diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
| commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
| tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /synapse/secrets.py | |
| parent | fix known broken test (diff) | |
| parent | Merge pull request #3543 from bebehei/docker (diff) | |
| download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'synapse/secrets.py')
| -rw-r--r-- | synapse/secrets.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/secrets.py b/synapse/secrets.py index f397daaa5e..f05e9ea535 100644 --- a/synapse/secrets.py +++ b/synapse/secrets.py @@ -20,17 +20,16 @@ See https://docs.python.org/3/library/secrets.html#module-secrets for the API used in Python 3.6, and the API emulated in Python 2.7. """ -import six +import sys -if six.PY3: +# secrets is available since python 3.6 +if sys.version_info[0:2] >= (3, 6): import secrets def Secrets(): return secrets - else: - import os import binascii |