From d7872cfde8044f064eb76a0ce647c5ba69099fe5 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 8 Jul 2014 12:59:24 -0300 Subject: Fix common exception handling gotchas. --- client/src/leap/soledad/client/target.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/src') diff --git a/client/src/leap/soledad/client/target.py b/client/src/leap/soledad/client/target.py index 7e563823..48472c53 100644 --- a/client/src/leap/soledad/client/target.py +++ b/client/src/leap/soledad/client/target.py @@ -860,7 +860,7 @@ class SoledadSyncTarget(HTTPSyncTarget, TokenBasedAuth): new_generation = metadata['new_generation'] new_transaction_id = metadata['new_transaction_id'] number_of_changes = metadata['number_of_changes'] - except json.JSONDecodeError, KeyError: + except (json.JSONDecodeError, KeyError): raise errors.BrokenSyncStream # make sure we have replica_uid from fresh new dbs if self._ensure_callback and 'replica_uid' in metadata: @@ -879,7 +879,7 @@ class SoledadSyncTarget(HTTPSyncTarget, TokenBasedAuth): content = entry['content'] gen = entry['gen'] trans_id = entry['trans_id'] - except IndexError, KeyError: + except (IndexError, KeyError): raise errors.BrokenSyncStream return new_generation, new_transaction_id, number_of_changes, \ doc_id, rev, content, gen, trans_id -- cgit v1.2.3