mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 09:03:40 +02:00
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:
@@ -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)
|
||||
|
@@ -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('')
|
||||
|
Reference in New Issue
Block a user