added support for adding text from generators

Author: amstocker

ipfsApi/client.py

@@ -492,6 +492,8 @@ def add_str(self, string, **kwargs):
 
         >> ipfs_client.add_str('Mary had a little lamb')
         u'QmZfF6C9j4VtoCsTp4KSrhYH47QMd3DNXVZBKaxJdhaPab'
+
+        Also accepts and will stream generator objects.
         """
         chunk_size = kwargs.pop('chunk_size',
                                 multipart.default_chunk_size)

ipfsApi/http.py

@@ -70,7 +70,11 @@ def request(self, path,
             res = requests.request(method, url,
                                    params=params, files=files, **kwargs)
 
-        if not decoder:
+        if path == '/cat':
+            # since <api>/cat only returns the raw data and not an encoded
+            # object, dont't try to parse it automatically.
+            ret = res.text
+        elif not decoder:
             try:
                 ret = self.default_enc.parse(res.text)
             except:

ipfsApi/multipart.py

@@ -5,6 +5,7 @@
 
 import fnmatch
 import os
+from inspect import isgenerator
 from sys import version_info
 from uuid import uuid4
 
@@ -304,7 +305,7 @@ def __init__(self, text, chunk_size=default_chunk_size):
     def body(self):
         for chunk in self.gen_chunks(self.envelope.file_open(self.name)):
             yield chunk
-        for chunk in self.gen_chunks([self.text]):
+        for chunk in self.gen_chunks(self.text):
             yield chunk
         for chunk in self.gen_chunks(self.envelope.file_close()):
             yield chunk
@@ -343,6 +344,8 @@ def stream_text(text, chunk_size=default_chunk_size):
     Returns a buffered generator which encodes a string as multipart/form-data.
     Also retrns the corresponding headers.
     """
+    if not isgenerator(text):
+        text = (text,)
     stream = TextStream(text, chunk_size=chunk_size)
 
     return stream.body(), stream.headers