git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f has_key
[sfa.git]
/
wsdl
/
sfa2wsdl.py
diff --git
a/wsdl/sfa2wsdl.py
b/wsdl/sfa2wsdl.py
index
3811d70
..
2eb9463
100755
(executable)
--- a/
wsdl/sfa2wsdl.py
+++ b/
wsdl/sfa2wsdl.py
@@
-9,7
+9,6
@@
import os, sys
import time
import pdb
import xml.dom.minidom
import time
import pdb
import xml.dom.minidom
-#import xml.dom.ext
import apistub
import inspect
import apistub
import inspect
@@
-18,6
+17,8
@@
from optparse import OptionParser
from sfa.storage.parameter import Parameter, Mixed
from sfa.storage.parameter import Parameter, Mixed
+from sfa.util.py23 import StringType
+
plc_ns="http://www.planet-lab.org/sfa"
class SoapError(Exception):
plc_ns="http://www.planet-lab.org/sfa"
class SoapError(Exception):
@@
-163,11
+164,11
@@
class WSDLGen:
return "xsd:boolean"
elif arg_type == FloatType:
return "xsd:double"
return "xsd:boolean"
elif arg_type == FloatType:
return "xsd:double"
- elif
arg_type in StringTypes
:
+ elif
issubclass(arg_type, StringType)
:
return "xsd:string"
else:
pdb.set_trace()
return "xsd:string"
else:
pdb.set_trace()
- raise SoapError
, "Cannot handle %s objects" % arg_type
+ raise SoapError
("Cannot handle %s objects" % arg_type)
def param_type(self, arg):
return (self.name_complex_type(arg))
def param_type(self, arg):
return (self.name_complex_type(arg))
@@
-189,7
+190,7
@@
class WSDLGen:
in_el.setAttribute("name", method + "_in")
for service_name in function.interfaces:
in_el.setAttribute("name", method + "_in")
for service_name in function.interfaces:
- if (se
lf.services.has_key(service_name)
):
+ if (se
rvice_name in self.services
):
if (not method in self.services[service_name]):
self.services[service_name].append(method)
else:
if (not method in self.services[service_name]):
self.services[service_name].append(method)
else:
@@
-327,10
+328,9
@@
class WSDLGen:
def pretty_print(self):
if (self.wsdl):
def pretty_print(self):
if (self.wsdl):
- #xml.dom.ext.PrettyPrint(self.wsdl)
- xml.dom.minidom.Document.toprettyxml(self.wsdl)
+ print xml.dom.minidom.Document.toprettyxml(self.wsdl)
else:
else:
- raise Exception("Empty WSDL")
+
raise Exception("Empty WSDL")
def main():
parser = OptionParser()
def main():
parser = OptionParser()