diff options
| author | drebs <drebs@leap.se> | 2013-01-16 09:55:27 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-16 09:55:27 -0200 |
| commit | e83572610574e8d3d96c0117fdb45764ffbeb538 (patch) | |
| tree | b7ab3411eb6365c242702f05c96f6d2617143e17 /src/leap/soledad/backends | |
| parent | 7759f6c6b862e792adb4a005d9ec27e313fb6e06 (diff) | |
Fix copy_database for couch tests.
Diffstat (limited to 'src/leap/soledad/backends')
| -rw-r--r-- | src/leap/soledad/backends/couch.py | 6 | ||||
| -rw-r--r-- | src/leap/soledad/backends/objectstore.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/leap/soledad/backends/couch.py b/src/leap/soledad/backends/couch.py index 5cde4805..78026af8 100644 --- a/src/leap/soledad/backends/couch.py +++ b/src/leap/soledad/backends/couch.py @@ -41,10 +41,8 @@ class CouchDatabase(ObjectStore): #------------------------------------------------------------------------- def _get_doc(self, doc_id, check_for_conflicts=False): - """Get just the document content, without fancy handling. - - Conflicts do not happen on server side, so there's no need to check - for them. + """ + Get just the document content, without fancy handling. """ cdoc = self._database.get(doc_id) if cdoc is None: diff --git a/src/leap/soledad/backends/objectstore.py b/src/leap/soledad/backends/objectstore.py index 03694532..2ddd4c79 100644 --- a/src/leap/soledad/backends/objectstore.py +++ b/src/leap/soledad/backends/objectstore.py @@ -212,7 +212,7 @@ class ObjectStore(CommonBackend): """ NotImplementedError(self._initialize) - def _get_u1db_data(self, u1db_data_doc_id): + def _get_u1db_data(self): """ Fetch u1db configuration data from backend storage. """ |