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>
This commit is contained in:
Fred Gleason 2021-11-05 12:43:50 -04:00
parent 0b5a5e7807
commit 0ffd393d48
3 changed files with 11 additions and 6 deletions

View File

@ -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.

View File

@ -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)

View File

@ -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:
print('NAME: '+svc.name.cdata)
if(svc.description.cdata):
print('DESCRIPTION: '+svc.description.cdata)
for svc in services['serviceList']['service']:
print('NAME: '+svc['name'])
if(svc['description']):
print('DESCRIPTION: '+svc['description'])
else:
print('DESCRIPTION: [none]')
print('')