Just use built in json parsing

t8y8 · t8y8 · commit 9377d919ecb6 · 2019-05-07T13:44:52.000-07:00
diff --git a/tableauserverclient/server/endpoint/metadata_endpoint.py b/tableauserverclient/server/endpoint/metadata_endpoint.py
@@ -24,7 +24,8 @@ def query(self, query, abort_on_error=False):
 
         # Setting content type because post_reuqest defaults to text/xml
         server_response = self.post_request(url, graphql_query, content_type='text/json')
-        results = json.loads(server_response.content)
+        breakpoint()
+        results = server_response.json()
 
         if abort_on_error and results.get('errors', None):
             raise GraphQLError(results['errors'])
diff --git a/test/test_metadata.py b/test/test_metadata.py
@@ -37,9 +37,9 @@ def setUp(self):
 
     def test_metadata_query(self):
         with open(METADATA_QUERY_SUCCESS, 'rb') as f:
-            response_json = f.read()
+            response_json = json.load(f)
         with requests_mock.mock() as m:
-            m.post(self.baseurl, content=response_json)
+            m.post(self.baseurl, json=response_json)
             actual = self.server.metadata.query('fake query')
 
             datasources = actual['data']
@@ -48,9 +48,9 @@ def test_metadata_query(self):
 
     def test_metadata_query_ignore_error(self):
         with open(METADATA_QUERY_ERROR, 'rb') as f:
-            response_json = f.read()
+            response_json = json.load(f)
         with requests_mock.mock() as m:
-            m.post(self.baseurl, content=response_json)
+            m.post(self.baseurl, json=response_json)
             actual = self.server.metadata.query('fake query')
             datasources = actual['data']
 
@@ -60,9 +60,9 @@ def test_metadata_query_ignore_error(self):
 
     def test_metadata_query_abort_on_error(self):
         with open(METADATA_QUERY_ERROR, 'rb') as f:
-            response_json = f.read()
+            response_json = json.load(f)
         with requests_mock.mock() as m:
-            m.post(self.baseurl, content=response_json)
+            m.post(self.baseurl, json=response_json)
 
             with self.assertRaises(GraphQLError) as e:
                 self.server.metadata.query('fake query', abort_on_error=True)
