use json instead of xml

Author: maxkahan

opentok/opentok.py

@@ -551,7 +551,6 @@ def create_session(
                 )
             else:
                 headers = self.get_headers()
-                headers['Accept'] = 'application/json'
                 response = requests.post(
                     self.endpoints.get_session_url(),
                     data=options,
@@ -569,6 +568,7 @@ def create_session(
 
         try:
             content_type = response.headers["Content-Type"]
+            # Legacy behaviour
             if content_type != "application/json":
                 dom = xmldom.parseString(response.content.decode("utf-8"))
                 error = dom.getElementsByTagName("error")
@@ -606,6 +606,7 @@ def get_headers(self):
                 + " python/"
                 + platform.python_version(),
                 "X-OPENTOK-AUTH": self._create_jwt_auth_header(),
+                "Accept": "application/json",
             }
         return {
             "User-Agent": self.user_agent + " OpenTok-With-Vonage-API-Backend",
@@ -1918,13 +1919,13 @@ def stop_render(self, render_id):
         logger.debug(
             "DELETE to %r with headers %r, proxies %r",
             self.endpoints.get_render_url(render_id=render_id),
-            self.get_headers(),
+            self.get_json_headers(),
             self.proxies,
         )
 
         response = requests.delete(
             self.endpoints.get_render_url(render_id=render_id),
-            headers=self.get_headers(),
+            headers=self.get_json_headers(),
             proxies=self.proxies,
             timeout=self.timeout,
         )
@@ -1955,14 +1956,14 @@ def list_renders(self, offset=0, count=50):
         logger.debug(
             "GET to %r with headers %r, params %r, proxies %r",
             self.endpoints.get_render_url(),
-            self.get_headers(),
+            self.get_json_headers(),
             query_params,
             self.proxies,
         )
 
         response = requests.get(
             self.endpoints.get_render_url(),
-            headers=self.get_headers(),
+            headers=self.get_json_headers(),
             params=query_params,
             proxies=self.proxies,
             timeout=self.timeout,
@@ -2193,7 +2194,7 @@ def mute_all(
                 options = {"active": True, "excludedStreams": []}
 
             response = requests.post(
-                url, headers=self.get_headers(), data=json.dumps(options)
+                url, headers=self.get_json_headers(), data=json.dumps(options)
             )
 
             if response:
@@ -2230,7 +2231,7 @@ def disable_force_mute(self, session_id: str) -> requests.Response:
         url = self.endpoints.get_mute_all_url(session_id)
 
         response = requests.post(
-            url, headers=self.get_headers(), data=json.dumps(options)
+            url, headers=self.get_json_headers(), data=json.dumps(options)
         )
 
         try:
@@ -2264,7 +2265,7 @@ def mute_stream(self, session_id: str, stream_id: str) -> requests.Response:
             if stream_id:
                 url = self.endpoints.get_stream_url(session_id, stream_id) + "/mute"
 
-            response = requests.post(url, headers=self.get_headers())
+            response = requests.post(url, headers=self.get_json_headers())
 
             if response:
                 return response
@@ -2381,7 +2382,7 @@ def mute_all(
                 options = {"active": True, "excludedStreams": []}
 
             response = requests.post(
-                url, headers=self.get_headers(), data=json.dumps(options)
+                url, headers=self.get_json_headers(), data=json.dumps(options)
             )
 
             if response:
@@ -2416,7 +2417,7 @@ def disable_force_mute(self, session_id: str) -> requests.Response:
         url = self.endpoints.get_mute_all_url(session_id)
 
         response = requests.post(
-            url, headers=self.get_headers(), data=json.dumps(options)
+            url, headers=self.get_json_headers(), data=json.dumps(options)
         )
 
         try:
@@ -2448,7 +2449,7 @@ def mute_stream(self, session_id: str, stream_id: str) -> requests.Response:
             if stream_id:
                 url = self.endpoints.get_stream_url(session_id, stream_id) + "/mute"
 
-            response = requests.post(url, headers=self.get_headers())
+            response = requests.post(url, headers=self.get_json_headers())
 
             if response:
                 return response

tests/test_session_creation.py

@@ -30,11 +30,9 @@ def test_create_default_session(self):
         httpretty.register_uri(
             httpretty.POST,
             u("https://api.opentok.com/session/create"),
-            body=u(
-                '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg</session_id><partner_id>123456</partner_id><create_dt>Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>'
-            ),
+            body='[{"session_id":"1_MX40NzY2NTk3MX5-MTczOTUzODg5NDk1OX5ROW1jWEcxUXJOM1RJWXU4eStwcHgvZ3N-UH5-","project_id":"47665971","partner_id":"47665971","create_dt":"Fri Feb 14 05:14:54 PST 2025","session_status":null,"status_invalid":null,"media_server_hostname":null,"messaging_server_url":null,"messaging_url":null,"symphony_address":null,"properties":null,"ice_server":null,"session_segment_id":"9c5fdd5b-7f5b-408f-8633-db95d0054fad","ice_servers":null,"ice_credential_expiration":86100}]',
             status=200,
-            content_type=u("text/xml"),
+            content_type=u("application/json"),
         )
 
         session = self.opentok.create_session()
@@ -56,7 +54,7 @@ def test_create_default_session(self):
             have_property(
                 u("session_id"),
                 u(
-                    "1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg"
+                    "1_MX40NzY2NTk3MX5-MTczOTUzODg5NDk1OX5ROW1jWEcxUXJOM1RJWXU4eStwcHgvZ3N-UH5-"
                 ),
             )
         )
@@ -141,11 +139,9 @@ def test_create_routed_session(self):
         httpretty.register_uri(
             httpretty.POST,
             u("https://api.opentok.com/session/create"),
-            body=u(
-                '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg</session_id><partner_id>123456</partner_id><create_dt>Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>'
-            ),
+            body='[{"session_id":"1_MX40NzY2NTk3MX5-MTczOTUzODg5NDk1OX5ROW1jWEcxUXJOM1RJWXU4eStwcHgvZ3N-UH5-","project_id":"47665971","partner_id":"47665971","create_dt":"Fri Feb 14 05:14:54 PST 2025","session_status":null,"status_invalid":null,"media_server_hostname":null,"messaging_server_url":null,"messaging_url":null,"symphony_address":null,"properties":null,"ice_server":null,"session_segment_id":"9c5fdd5b-7f5b-408f-8633-db95d0054fad","ice_servers":null,"ice_credential_expiration":86100}]',
             status=200,
-            content_type=u("text/xml"),
+            content_type=u("application/json"),
         )
 
         session = self.opentok.create_session(media_mode=MediaModes.routed)
@@ -162,7 +158,7 @@ def test_create_routed_session(self):
             have_property(
                 u("session_id"),
                 u(
-                    "1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg"
+                    "1_MX40NzY2NTk3MX5-MTczOTUzODg5NDk1OX5ROW1jWEcxUXJOM1RJWXU4eStwcHgvZ3N-UH5-"
                 ),
             )
         )