summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-03-26 20:10:01 -0300
committerdrebs <drebs@leap.se>2017-04-04 18:27:39 +0200
commit09abcf5a811e160507bb12a59550aa8fa1c64f40 (patch)
tree8ba218098a7de9522e409c7cb92617d27964f1cd
parent96258086a079d54f0e1349aca41878d93102b822 (diff)
[refactor] list is remote_list, avoiding confusion
-rw-r--r--client/src/leap/soledad/client/_blobs.py2
-rw-r--r--testing/tests/server/test_blobs_server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/leap/soledad/client/_blobs.py b/client/src/leap/soledad/client/_blobs.py
index e781421e..81e919af 100644
--- a/client/src/leap/soledad/client/_blobs.py
+++ b/client/src/leap/soledad/client/_blobs.py
@@ -158,7 +158,7 @@ class BlobManager(object):
return self.local.close()
@defer.inlineCallbacks
- def list(self):
+ def remote_list(self):
uri = urljoin(self.remote, self.user + '/')
data = yield self._client.get(uri)
defer.returnValue((yield data.json()))
diff --git a/testing/tests/server/test_blobs_server.py b/testing/tests/server/test_blobs_server.py
index 3c534c0c..367a31cc 100644
--- a/testing/tests/server/test_blobs_server.py
+++ b/testing/tests/server/test_blobs_server.py
@@ -58,7 +58,7 @@ class BlobServerTestCase(unittest.TestCase):
self.secret, 'user')
yield manager._encrypt_and_upload('blob_id1', '1', '1', BytesIO("1"))
yield manager._encrypt_and_upload('blob_id2', '2', '2', BytesIO("2"))
- blobs_list = yield manager.list()
+ blobs_list = yield manager.remote_list()
assert len(blobs_list) == 2
assert 'blob_id1' in blobs_list and 'blob_id2' in blobs_list