maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3626 from krombel/only_import_secrets_when_available

Browse source 
Only import secrets when available
This commit is contained in:
Amber Brown 2018-07-31 08:58:24 +10:00 committed by GitHub
parent e9b2d047f6 254e8267e2
commit 52384f2ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/3626.bugfix Normal file
View file

@ -0,0 +1 @@
Only import secrets when available (fix for py < 3.6)

7
synapse/secrets.py
View file

@ -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. 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 import secrets
def Secrets(): def Secrets():
return secrets return secrets
else: else:
import os import os
import binascii import binascii