summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-31 13:10:37 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-31 13:10:37 -0300
commit216d0a43de4d2f6b93470a9a5a94c17c118380c0 (patch)
treef84978f0047ff0c665195ab5f762544bc9f10d0c /common
parente9e3cd7531d97a67ca4d08f102abe8fdb2585790 (diff)
parent5914f47d4f1f3cad1429b11ddce467e7cc65aedb (diff)
Merge remote-tracking branch 'drebs/bug/fix-dict-representation-for-python-2.6' into develop
Diffstat (limited to 'common')
-rw-r--r--common/src/leap/soledad/common/errors.py4
1 files changed, 2 insertions, 2 deletions
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(