diff options
| author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
| commit | 71df5a4431bce607550eec4425f4fdfbdbfa2af7 (patch) | |
| tree | f71347068d0a9296c857a5027728130e7ed14ca8 /backends/leap_backend.py | |
| parent | 3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (diff) | |
| parent | 2f761fea9e72554806b012c64d00fcae80e1d254 (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'backends/leap_backend.py')
| -rw-r--r-- | backends/leap_backend.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backends/leap_backend.py b/backends/leap_backend.py index 3e859f7c..7e98dd45 100644 --- a/backends/leap_backend.py +++ b/backends/leap_backend.py @@ -41,8 +41,9 @@ class LeapDocument(Document): """ if not self._soledad: raise NoSoledadInstance() - ciphertext = self._soledad.encrypt_symmetric(self.doc_id, self.get_json()) - return json.dumps({'_encrypted_json' : ciphertext}) + ciphertext = self._soledad.encrypt_symmetric(self.doc_id, + self.get_json()) + return json.dumps({'_encrypted_json': ciphertext}) def set_encrypted_json(self, encrypted_json): """ @@ -89,7 +90,8 @@ class LeapDatabase(HTTPDatabase): doc_id = self._allocate_doc_id() res, headers = self._request_json('PUT', ['doc', doc_id], {}, content, 'application/json') - new_doc = self._factory(doc_id, res['rev'], content, soledad=self._soledad) + new_doc = self._factory(doc_id, res['rev'], content, + soledad=self._soledad) return new_doc |