Show CiscoIPPhoneError messages for non-200 responses.

.pylintrc

@@ -3,7 +3,7 @@ persistent=no
 extension-pkg-whitelist=lxml
 
 [MESSAGES CONTROL]
-disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,bad-whitespace,invalid-name,redefined-builtin,broad-except,consider-using-sys-exit,too-many-branches,too-many-statements,too-many-arguments,line-too-long,too-many-locals,len-as-condition,wrong-import-position,unused-argument,duplicate-code,too-many-nested-blocks,arguments-differ
+disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,bad-whitespace,invalid-name,redefined-builtin,broad-except,multiple-statements,consider-using-sys-exit,too-many-branches,too-many-statements,too-many-arguments,line-too-long,too-many-locals,len-as-condition,wrong-import-position,unused-argument,duplicate-code,too-many-nested-blocks,arguments-differ
 
 [REPORTS]
 output-format=text

cgiexecute

@@ -57,7 +57,6 @@ def cgi_execute(hostname, port, timeout, username, password, certificate_file, u
 
         response = session.post(f'{scheme}://{hostname}:{port}/CGI/Execute',
                                 timeout = timeout, auth = auth, verify = certificate_file, data = {'XML': xml})
-        response.raise_for_status()
 
     except requests.RequestException as error:
         raise ProgramError(error)
@@ -71,9 +70,9 @@ def cgi_execute(hostname, port, timeout, username, password, certificate_file, u
         raise ProgramError(error)
 
     if document.tag == 'CiscoIPPhoneError':
-        number = document.get('Number')
+        number = document.get('Number', '')
 
-        raise ProgramError('Error: ' + cgi_errors.get(number, f'{number}'))
+        raise ProgramError('Error: ' + cgi_errors.get(number, number))
 
     for element in document.findall('ResponseItem'):
         url = element.get('URL')

mediastream

@@ -18,11 +18,18 @@ from lxml import etree
 import requests
 import requests.auth
 import requests.adapters
-import gi
-gi.require_version('Gst', '1.0')
+import gi; gi.require_version('Gst', '1.0')
 from gi.repository import GLib, Gst
 
 
+cgi_errors = {
+    '1': 'Error parsing CiscoIPPhone object',
+    '2': 'Error framing CiscoIPPhone object',
+    '3': 'Internal file error',
+    '4': 'Authentication error'
+}
+
+
 class ProgramError(Exception):
     pass
 
@@ -91,8 +98,16 @@ def start_media(target_hostnames, multicast_address, port, timeout, username, pa
             try:
                 document = etree.fromstring(future.result())
 
+                if document.tag == 'CiscoIPPhoneError':
+                    number = document.get('Number', '')
+
+                    raise ProgramError('Error: ' + cgi_errors.get(number, number))
+
                 if document.tag == 'errorResponse':
-                    raise ProgramError(document.findtext('type', '') + ': ' + document.findtext('data', ''))
+                    type = document.findtext('type', '')
+                    data = document.findtext('data', '')
+
+                    raise ProgramError(f'Error {type}: {data}')
 
                 if document.tag != 'mediaStream':
                     raise ProgramError(f'Unexpected XML: {document.tag}')
@@ -101,7 +116,7 @@ def start_media(target_hostnames, multicast_address, port, timeout, username, pa
                 # Remove address so we don't try and send it audio
                 target_hostnames.remove(target_hostname)
 
-                print(f'Error {target_hostname}: {error}')
+                print(f'{target_hostname} {error}')
 
 
 def stream_media(target_hostnames, multicast_address, port, codec, wav_file):
@@ -259,10 +274,12 @@ def stop_media(target_hostnames, timeout, username, password, certificate_file):
                 document = etree.fromstring(future.result())
 
                 if document.tag == 'CiscoIPPhoneError':
-                    raise ProgramError(document.get('Number', '0'))
+                    number = document.get('Number', '')
+
+                    raise ProgramError('Error: ' + cgi_errors.get(number, number))
 
             except Exception as error:
-                print(f'Error {target_hostname}: {error}')
+                print(f'{target_hostname} {error}')
 
 
 def main():

screenshot

@@ -39,7 +39,6 @@ def get_screenshot(hostname, port, timeout, username, password, certificate_file
 
         response = session.get(f'{scheme}://{hostname}:{port}/CGI/Screenshot',
                                timeout = timeout, auth = auth, verify = certificate_file)
-        response.raise_for_status()
 
     except requests.RequestException as error:
         raise ProgramError(error)

setbackground

@@ -48,7 +48,6 @@ def set_background(hostname, port, timeout, username, password, certificate_file
 
         response = session.post(f'{scheme}://{hostname}:{port}/CGI/Execute',
                                 timeout = timeout, auth = auth, verify = certificate_file, data = {'XML': xml})
-        response.raise_for_status()
 
     except requests.RequestException as error:
         raise ProgramError(error)

setringtone

@@ -45,7 +45,6 @@ def set_ringtone(hostname, port, timeout, username, password, certificate_file,
 
         response = session.post(f'{scheme}://{hostname}:{port}/CGI/Execute',
                                 timeout = timeout, auth = auth, verify = certificate_file, data = {'XML': xml})
-        response.raise_for_status()
 
     except requests.RequestException as error:
         raise ProgramError(error)

xmlinfo

@@ -43,7 +43,6 @@ def get_info(hostname, port, timeout, info, username, password, certificate_file
 
         response = session.get(f'{scheme}://{hostname}:{port}/CGI/{path}',
                                timeout = timeout, auth = auth, verify = certificate_file)
-        response.raise_for_status()
 
     except requests.RequestException as error:
         raise ProgramError(error)