summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKrombel <krombel@krombel.de>2018-07-30 19:38:38 +0200
committerKrombel <krombel@krombel.de>2018-07-30 23:59:02 +0200
commit254e8267e20ccde19f89eccdfb67b7aaecb32eec (patch)
tree5b889ca649db2b36925d178c7f40adc6c34172bf /synapse
parentmake /context lazyload & filter aware (#3567) (diff)
downloadsynapse-254e8267e20ccde19f89eccdfb67b7aaecb32eec.tar.xz
Only import secrets when available
secrets got introduced in python 3.6 so this class is not available
in 3.5 and before.

This now checks for the current running version and only tries using
secrets if the version is 3.6 or above

Signed-Off-By: Matthias Kesler <krombel@krombel.de>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/secrets.py7
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