Merge pull request #21 from VultureProject/dev

Fix TCP Forwarder Handling (#20)

Author: HugoSoszynski

darwin/darwinapi.py

@@ -222,7 +222,11 @@ def low_level_call(self, **kwargs):
 
         darwin_header = kwargs.get("header", None)
         darwin_data = kwargs.get("data", None)
-        darwin_body = json.dumps(darwin_data)
+        #
+        # The 'indent' parameter is set to add '\n' in the json.
+        # For more details, please see l.274.
+        #
+        darwin_body = json.dumps(darwin_data, indent=2)
 
         if darwin_header is None:
             darwin_header_descr = kwargs.get("header_descr", None)
@@ -248,7 +252,7 @@ def low_level_call(self, **kwargs):
                 ))
 
             if darwin_body is not None:
-                darwin_header.body_size = len(darwin_body) + 1 # See l. 270
+                darwin_header.body_size = len(darwin_body) + 1 # See l. 274
 
             else:
                 darwin_header.body_size = 0

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="darwin",
-    version="1.2",
+    version="1.2.1",
     description="Call Darwin with your Python code!",
     url="https://github.com/VultureProject/darwin-client-python",
     author="Guillaume Catto",