Merge branch 'master' of github.com:/krebscode/painload

1 files changed, 14 insertions, 10 deletions

diff --git a/ovh/soapi/domainList b/ovh/soapi/domainList
index 3f829ebe..342eec72 100755
--- a/ovh/soapi/domainList
+++ b/ovh/soapi/domainList
@@ -1,24 +1,28 @@
 #!/usr/bin/python
 
 from os import environ
-import pprint
+from os.path import dirname, realpath
 from SOAPpy import WSDL
+from json import dumps, JSONEncoder
 
-soap = WSDL.Proxy('https://www.ovh.com/soapi/soapi-re-1.24.wsdl')
+def default(o):
+   try:
+       iterable = iter(o)
+   except TypeError:
+       pass
+   else:
+       return list(iterable)
+   return JSONEncoder.default(o)
+
+wsdl = dirname(realpath(__file__)) + '/soapi-re-1.24.wsdl'
+soap = WSDL.Proxy(wsdl)
 
 username = environ['KREBS_OVH_USER']
 password = environ['KREBS_OVH_PASS']
 
-#login
 session = soap.login(username, password, 'de', 0)
-print "login successfull"
 
-#domainHostList
 result = soap.domainList(session)
-print "domainList successfull"
-pp = pprint.PrettyPrinter(indent=4)
-pp.pprint(result) # your code here ...
+print dumps(result, sort_keys=True, indent=2, default=default)
 
-#logout
 soap.logout(session)
-print "logout successfull"