summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server1
-rw-r--r--common/src/leap/soledad/common/errors.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server b/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
deleted file mode 100644
index 1d53e1ef..00000000
--- a/common/changes/feature_4097-allow-for-locking-creation-of-secrets-in-server
+++ /dev/null
@@ -1 +0,0 @@
- o Move some common functions and global variables to leap.soledad.common.
diff --git a/common/src/leap/soledad/common/errors.py b/common/src/leap/soledad/common/errors.py
index 45433627..7c2d7296 100644
--- a/common/src/leap/soledad/common/errors.py
+++ b/common/src/leap/soledad/common/errors.py
@@ -61,9 +61,9 @@ class AlreadyLockedError(errors.U1DBError):
# maps.
for e in [InvalidTokenError, NotLockedError, AlreadyLockedError]:
http_errors.wire_description_to_status.update({
- (e.wire_description, e.status)})
+ e.wire_description: e.status})
errors.wire_description_to_exc.update({
- (e.wire_description, e)})
+ e.wire_description: e})
# u1db error statuses also have to be updated
http_errors.ERROR_STATUSES = set(