SW-609: Create JSON with a String instead of Bytes

LTA/ltastorageoverview/test/test_lso_webservice.py

@@ -29,7 +29,7 @@ import urllib.request, urllib.error, urllib.parse
 import json
 import datetime
 import psycopg2
-from io import BytesIO
+from io import StringIO
 import lofar.common.dbcredentials as dbc
 from lofar.lta.ltastorageoverview import store
 from lofar.lta.ltastorageoverview.webservice import webservice as webservice
@@ -116,7 +116,7 @@ class TestLTAStorageWebService(FlaskLiveTestCase):
         self.assertEqual(200, response.code)
         self.assertEqual('application/json', response.info()['Content-Type'])
 
-        content = json.load(BytesIO(response.read()))
+        content = json.load(StringIO(response.read().decode("UTF-8")))
 
         self.assertTrue('sites' in content)
         sites = content['sites']
@@ -132,7 +132,7 @@ class TestLTAStorageWebService(FlaskLiveTestCase):
             self.assertEqual(200, response.code)
             self.assertEqual('application/json', response.info()['Content-Type'])
 
-            content = json.load(BytesIO(response.read()))
+            content = json.load(StringIO(response.read().decode("UTF-8")))
 
             self.assertTrue('id' in content)
             self.assertTrue('name' in content)
@@ -143,7 +143,7 @@ class TestLTAStorageWebService(FlaskLiveTestCase):
         self.assertEqual(200, response.code)
         self.assertEqual('application/json', response.info()['Content-Type'])
 
-        content = json.load(BytesIO(response.read()))
+        content = json.load(StringIO(response.read().decode("UTF-8")))
         self.assertTrue('rootDirectories' in content)
 
         rootDirectories = content['rootDirectories']

SAS/SpecificationServices/test/t_telescope_model_xml_generator_type1.py

@@ -84,7 +84,7 @@ class TestTelescopeModelXMLGeneratorType1(unittest.TestCase):
 
         generator = TelescopeModelXMLGeneratorType1()
         xmldoc = generator.get_xml_tree(self.model)
-        result = etree.tostring(xmldoc)
+        result = str(etree.tostring(xmldoc), "UTF-8")
 
         assertEqualXML(result, golden_xmldoc)
 
@@ -94,7 +94,7 @@ class TestTelescopeModelXMLGeneratorType1(unittest.TestCase):
         f.close()
 
         xmldoc = etree.parse(BytesIO(xmlcontent.encode('UTF-8')))
-        return etree.tostring(xmldoc)
+        return str(etree.tostring(xmldoc), "UTF-8")
 
 
 if __name__ == '__main__':