From 741350afa40b60fe1c6fae349e7d5869350c2adf Mon Sep 17 00:00:00 2001
From: Jonathan D'Orleans <jonathan.dorleans@mycroft.ai>
Date: Fri, 16 Sep 2016 15:34:20 -0400
Subject: [PATCH] Issues 356 - Adding data stream support along with json

---
 mycroft/api/__init__.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mycroft/api/__init__.py b/mycroft/api/__init__.py
index 3bb3b2a62a..8b068ea74e 100644
--- a/mycroft/api/__init__.py
+++ b/mycroft/api/__init__.py
@@ -19,9 +19,10 @@ class Api(object):
     def request(self, params):
         method = params.get("method", "GET")
         headers = self.build_headers(params)
-        body = self.build_body(params)
+        json = self.build_json(params)
         url = self.build_url(params)
-        response = requests.request(method, url, headers=headers, json=body)
+        response = requests.request(method, url, headers=headers,
+                                    data=params.get("data"), json=json)
         return self.get_response(response)
 
     @staticmethod
@@ -51,14 +52,14 @@ class Api(object):
         if not headers.__contains__("Authorization"):
             headers["Authorization"] = "Bearer " + self.identity.token
 
-    def build_body(self, params):
-        body = params.get("body")
-        if body and params["headers"]["Content-Type"] == "application/json":
-            for k, v in body.iteritems():
+    def build_json(self, params):
+        json = params.get("json")
+        if json and params["headers"]["Content-Type"] == "application/json":
+            for k, v in json.iteritems():
                 if v == "":
-                    body[k] = None
-        params["body"] = body
-        return body
+                    json[k] = None
+            params["json"] = json
+        return json
 
     def build_url(self, params):
         path = params.get("path", "")
@@ -79,7 +80,7 @@ class DeviceApi(Api):
         return self.request({
             "method": "POST",
             "path": "/activate",
-            "body": {"state": state, "token": token}
+            "json": {"state": state, "token": token}
         })
 
     def find(self):
@@ -102,5 +103,5 @@ class STTApi(Api):
             "method": "POST",
             "headers": {"Content-Type": "audio/x-flac"},
             "path": "/stt?lang=" + language,
-            "body": audio
+            "data": audio
         })