summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-05-16 15:49:18 -0400
committerKali Kaneko <kali@leap.se>2016-05-16 15:49:18 -0400
commitff5bd3f8e1cedd01119cd02b395c2bdbfa377c71 (patch)
tree9e5c99f161d55ea9d8fde339792840a5168756fb
parent96e27b6d258562d0e83696cefb1d11c60a31acf2 (diff)
[style] pep8
-rw-r--r--client/src/leap/soledad/client/crypto.py3
-rw-r--r--common/src/leap/soledad/common/__init__.py4
-rw-r--r--server/src/leap/soledad/server/__init__.py3
3 files changed, 4 insertions, 6 deletions
diff --git a/client/src/leap/soledad/client/crypto.py b/client/src/leap/soledad/client/crypto.py
index 363d71b9..b75d4301 100644
--- a/client/src/leap/soledad/client/crypto.py
+++ b/client/src/leap/soledad/client/crypto.py
@@ -26,7 +26,8 @@ import logging
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
from cryptography.hazmat.backends.multibackend import MultiBackend
-from cryptography.hazmat.backends.openssl.backend import Backend as OpenSSLBackend
+from cryptography.hazmat.backends.openssl.backend \
+ import Backend as OpenSSLBackend
from leap.soledad.common import soledad_assert
from leap.soledad.common import soledad_assert_type
diff --git a/common/src/leap/soledad/common/__init__.py b/common/src/leap/soledad/common/__init__.py
index d7f6929c..1ba6ab89 100644
--- a/common/src/leap/soledad/common/__init__.py
+++ b/common/src/leap/soledad/common/__init__.py
@@ -47,7 +47,3 @@ __all__ = [
"soledad_assert_type",
"__version__",
]
-
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index 43554eb4..72d61224 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -76,7 +76,8 @@ This has some implications:
(not implemented yet) to prevent excess storage.
The authorization for creating, updating, deleting and retrieving recovery
-documents on the shared database is handled by `leap.soledad.server.auth` module.
+documents on the shared database is handled by `leap.soledad.server.auth`
+module.
"""
import configparser