dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed pysimplesoap, fixes issues #2254, thanks pgastinger

Browse Source
This commit is contained in:
mdipierro
2020-03-21 12:29:22 -07:00
parent a633bcde7d
commit 279858b424
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/pysimplesoap/server.py
+13 -8
View File
@@ -15,7 +15,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import sys import sys
if sys.version > '3':
if sys.version_info[0] < 3:
is_py2 = True
else:
is_py2 = False
unicode = str unicode = str
@@ -160,7 +164,8 @@ class SoapDispatcher(object):
# Now we change 'external' and 'model' to the received forms i.e. 'ext' and 'mod' # Now we change 'external' and 'model' to the received forms i.e. 'ext' and 'mod'
# After that we know how the client has prefixed additional namespaces # After that we know how the client has prefixed additional namespaces
ns = NS_RX.findall(xml) decoded_xml = xml if is_py2 else xml.decode('utf8')
ns = NS_RX.findall(decoded_xml)
for k, v in ns: for k, v in ns:
if v in self.namespaces.values(): if v in self.namespaces.values():
_ns_reversed[v] = k _ns_reversed[v] = k
@@ -369,23 +374,23 @@ class SoapDispatcher(object):
e['name'] = k e['name'] = k
if array: if array:
e[:] = {'minOccurs': "0", 'maxOccurs': "unbounded"} e[:] = {'minOccurs': "0", 'maxOccurs': "unbounded"}
if v in TYPE_MAP.keys(): if v is None:
t = 'xsd:%s' % TYPE_MAP[v]
elif v is None:
t = 'xsd:anyType' t = 'xsd:anyType'
elif isinstance(v, list): elif type(v) == list:
n = "ArrayOf%s%s" % (name, k) n = "ArrayOf%s%s" % (name, k)
l = [] l = []
for d in v: for d in v:
l.extend(d.items()) l.extend(d.items())
parse_element(n, l, array=True, complex=True) parse_element(n, l, array=True, complex=True)
t = "tns:%s" % n t = "tns:%s" % n
elif isinstance(v, dict): elif type(v) == dict:
n = "%s%s" % (name, k) n = "%s%s" % (name, k)
parse_element(n, v.items(), complex=True) parse_element(n, v.items(), complex=True)
t = "tns:%s" % n t = "tns:%s" % n
elif v in TYPE_MAP:
t = 'xsd:%s' % TYPE_MAP[v]
else: else:
raise TypeError("unknonw type %s for marshalling" % str(v)) raise TypeError("unknown type %s for marshalling" % str(v))
e.add_attribute('type', t) e.add_attribute('type', t)
parse_element("%s" % method, args and args.items()) parse_element("%s" % method, args and args.items())