1 files changed, 15 insertions, 12 deletions
diff --git a/client/src/leap/soledad/client/http_target/support.py b/client/src/leap/soledad/client/http_target/support.py
index 6ec98ed4..40e5eb55 100644
--- a/client/src/leap/soledad/client/http_target/support.py
+++ b/client/src/leap/soledad/client/http_target/support.py
@@ -155,7 +155,6 @@ class RequestBody(object):
         self.headers = header_dict
         self.entries = []
         self.consumed = 0
-        self.pending_size = 0
 
     def insert_info(self, **entry_dict):
         """
@@ -169,9 +168,8 @@ class RequestBody(object):
         """
         entry = json.dumps(entry_dict)
         self.entries.append(entry)
-        self.pending_size += len(entry)
 
-    def pop(self):
+    def pop(self, amount=10):
         """
         Removes all entries and returns it formatted and ready
         to be sent.
@@ -182,19 +180,20 @@ class RequestBody(object):
         :return: formatted body ready to be sent
         :rtype: str
         """
-        entries = self.entries[:]
-        self.entries = []
-        self.pending_size = 0
-        self.consumed += len(entries)
-        return self.entries_to_str(entries)
+        start = self.consumed == 0
+        amount = min([len(self.entries), amount])
+        entries = [self.entries.pop(0) for i in xrange(amount)]
+        self.consumed += amount
+        end = len(self.entries) == 0
+        return self.entries_to_str(entries, start, end)
 
     def __str__(self):
-        return self.entries_to_str(self.entries)
+        return self.pop(len(self.entries))
 
     def __len__(self):
         return len(self.entries)
 
-    def entries_to_str(self, entries=None):
+    def entries_to_str(self, entries=None, start=True, end=True):
         """
         Format a list of entries into the body format expected
         by the server.
@@ -205,6 +204,10 @@ class RequestBody(object):
         :return: formatted body ready to be sent
         :rtype: str
         """
-        data = '[\r\n' + json.dumps(self.headers)
+        data = ''
+        if start:
+            data = '[\r\n' + json.dumps(self.headers)
         data += ''.join(',\r\n' + entry for entry in entries)
-        return data + '\r\n]'
+        if end:
+            data += '\r\n]'
+        return data