Merge pull request #38 from ingokeck/master

Fix for get_pyobject() and add_pyobject() failing

Author: amstocker

ipfsApi/utils.py

@@ -72,7 +72,7 @@ def parse_pyobj(pickled):
     [1, 2, 3, True, 4.5, None, 6000.0]
     """
     if isinstance(pickled, six.text_type):
-        pickled = pickled.encode('ascii')
+        pickled = pickled.encode('latin_1')
     return pickle.loads(pickled)
 
 

test/functional/tests.py

@@ -1,3 +1,4 @@
+# _*_ coding: utf-8 -*-
 import os
 import unittest
 
@@ -6,6 +7,7 @@
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 
+
 class IpfsApiTest(unittest.TestCase):
 
     api = ipfsApi.Client()
@@ -38,7 +40,7 @@ class IpfsApiTest(unittest.TestCase):
                        u'Name': u'popoiopiu'},
                       {u'Hash': u'QmVkNdzCBukBRdpyFiKPyL2R15qPExMr9rV9RFV2kf9eeV',
                        u'Name': u''}]
-    
+
     ## test_add_multiple_from_dirname
     fake_dir_test2 = 'fake_dir/test2'
     fake_dir_res = [{u'Hash': u'QmNuvmuFeeWWpxjCQwLkHshr8iqhGLWXFzSGzafBeawTTZ',
@@ -106,6 +108,12 @@ def test_add_recursive(self):
                          sorted(self.fake_dir_recursive_res,
                                 key=lambda x: x['Name']))
 
+    def test_add_get_pyobject(self):
+        data = [-1, 3.14, u'Hän€', b'23' ]
+        res = self.api.add_pyobj(data)
+        self.assertEqual(data,
+                         self.api.get_pyobj(res))
+
 
 if __name__ == "__main__":
     unittest.main()