summaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
Diffstat (limited to 'backends')
-rw-r--r--backends/couch.py6
-rw-r--r--backends/objectstore.py2
2 files changed, 3 insertions, 5 deletions
diff --git a/backends/couch.py b/backends/couch.py
index 5cde4805..78026af8 100644
--- a/backends/couch.py
+++ b/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/backends/objectstore.py b/backends/objectstore.py
index 03694532..2ddd4c79 100644
--- a/backends/objectstore.py
+++ b/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.
"""