2021-11-05 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'untangle' Python module dependency from the
	'rivwebpyapi' API.
	* Added a 'xmltodict' Python module dependency to the 'rivwebpyapi'
	API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

ChangeLog

@@ -22573,3 +22573,8 @@
 	Operations Guide to after the 'The RDCatch Main Window' section.
 2021-11-04 Fred Gleason <fredg@paravelsystems.com>
 	* Added a 'rivwebpyapi' API.
+2021-11-05 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'untangle' Python module dependency from the
+	'rivwebpyapi' API.
+	* Added a 'xmltodict' Python module dependency to the 'rivwebpyapi'
+	API.

apis/rivwebpyapi/api/rivwebpyapi.py

@@ -19,7 +19,7 @@
 #
 
 import requests
-import untangle
+import xmltodict
 
 class RivWebPyApi(object):
     """
@@ -66,4 +66,4 @@ class RivWebPyApi(object):
         r=requests.post(self.__connection_url,data=postdata)
         if(r.status_code!=requests.codes.ok):
             r.raise_for_status()
-        return untangle.parse(r.text)
+        return xmltodict.parse(r.text)

apis/rivwebpyapi/tests/list_services.py

@@ -52,10 +52,10 @@ if((not url)or(not username)):
 
 webapi=rivwebpyapi.RivWebPyApi(url=url,username=username,passwd=password)
 services=webapi.ListServices(False)
-for svc in services.serviceList.service:
+for svc in services['serviceList']['service']:
-    print('NAME: '+svc.name.cdata)
+    print('NAME: '+svc['name'])
-    if(svc.description.cdata):
+    if(svc['description']):
-        print('DESCRIPTION: '+svc.description.cdata)
+        print('DESCRIPTION: '+svc['description'])
     else:
         print('DESCRIPTION: [none]')
     print('')