0001-misc-move-duplicated-soap-utility-functions-to-main-.patch

Frédéric Péters, 09 octobre 2018 15:23

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: move duplicated soap utility functions to main soap.py
 (#27140)

 passerelle/contrib/maarch/soap.py          | 40 ++-------------------
 passerelle/contrib/seisin_by_email/soap.py | 39 ++------------------
 passerelle/contrib/teamnet_axel/soap.py    | 41 ++--------------------
 passerelle/soap.py                         | 38 ++++++++++++++++++++
 4 files changed, 45 insertions(+), 113 deletions(-)

     from suds.transport.http import HttpAuthenticated
     from suds.transport import Reply
     from suds.client import Client
     from suds.sudsobject import asdict
     from passerelle.soap import recursive_asdict, client_to_jsondict
     class Transport(HttpAuthenticated):
         def __init__(self, model, **kwargs):
-...
         transport = Transport(model)
         return Client(model.wsdl_url, transport=transport, cache=None)
     def client_to_jsondict(client):
         """return description of the client, as dict (for json export)"""
         res = {}
         for i, sd in enumerate(client.sd):
             d = {}
             d['tns'] = sd.wsdl.tns[1]
             d['prefixes'] = dict(p for p in sd.prefixes)
             d['ports'] = {}
             for p in sd.ports:
                 d['ports'][p[0].name] = {}
                 for m in p[1]:
                     d['ports'][p[0].name][m[0]] = dict(
                             (mp[0], sd.xlate(mp[1])) for mp in m[1])
             d['types'] = {}
             for t in sd.types:
                 ft = client.factory.create(sd.xlate(t[0]))
                 d['types'][sd.xlate(t[0])] = unicode(ft)
             res[sd.service.name] = d
         return res
     def recursive_asdict(d):
         """Convert Suds object into serializable format."""
         out = {}
         for k, v in asdict(d).iteritems():
             if hasattr(v, '__keylist__'):
                 out[k] = recursive_asdict(v)
             elif isinstance(v, list):
                 out[k] = []
                 for item in v:
                     if hasattr(item, '__keylist__'):
                         out[k].append(recursive_asdict(item))
                     else:
                         out[k].append(item)
             else:
                 out[k] = v
         return out

     from suds.client import Client
     from suds.sudsobject import asdict
     from passerelle.soap import recursive_asdict, client_to_jsondict
     class Transport(HttpAuthenticated):
         def __init__(self, model, **kwargs):
-...
     def get_client(model):
         transport = Transport(model)
         return Client(model.wsdl_url, transport=transport, cache=None)
     def client_to_jsondict(client):
         """return description of the client, as dict (for json export)"""
         res = {}
         for i, sd in enumerate(client.sd):
             d = {}
             d['tns'] = sd.wsdl.tns[1]
             d['prefixes'] = dict(p for p in sd.prefixes)
             d['ports'] = {}
             for p in sd.ports:
                 d['ports'][p[0].name] = {}
                 for m in p[1]:
                     d['ports'][p[0].name][m[0]] = dict(
                             (mp[0], sd.xlate(mp[1])) for mp in m[1])
             d['types'] = {}
             for t in sd.types:
                 ft = client.factory.create(sd.xlate(t[0]))
                 d['types'][sd.xlate(t[0])] = unicode(ft)
             res[sd.service.name] = d
         return res
     def recursive_asdict(d):
         """Convert Suds object into serializable format."""
         out = {}
         for k, v in asdict(d).iteritems():
             if hasattr(v, '__keylist__'):
                 out[k] = recursive_asdict(v)
             elif isinstance(v, list):
                 out[k] = []
                 for item in v:
                     if hasattr(item, '__keylist__'):
                         out[k].append(recursive_asdict(item))
                     else:
                         out[k].append(item)
             else:
                 out[k] = v
         return out

     from suds.client import Client
     from suds.sudsobject import asdict
     from passerelle.soap import recursive_asdict, client_to_jsondict
     class Transport(HttpAuthenticated):
-...
         return Client(model.wsdl_url, transport=transport, cache=None)
     def client_to_jsondict(client):
         """return description of the client, as dict (for json export)"""
         res = {}
         for i, sd in enumerate(client.sd):
             d = {}
             d['tns'] = sd.wsdl.tns[1]
             d['prefixes'] = dict(p for p in sd.prefixes)
             d['ports'] = {}
             for p in sd.ports:
                 d['ports'][p[0].name] = {}
                 for m in p[1]:
                     d['ports'][p[0].name][m[0]] = dict(
                         (mp[0], sd.xlate(mp[1])) for mp in m[1])
             d['types'] = {}
             for t in sd.types:
                 ft = client.factory.create(sd.xlate(t[0]))
                 d['types'][sd.xlate(t[0])] = unicode(ft)
             res[sd.service.name] = d
         return res
     def recursive_asdict(d):
         """Convert Suds object into serializable format."""
         out = {}
         for k, v in asdict(d).iteritems():
             if hasattr(v, '__keylist__'):
                 out[k] = recursive_asdict(v)
             elif isinstance(v, list):
                 out[k] = []
                 for item in v:
                     if hasattr(item, '__keylist__'):
                         out[k].append(recursive_asdict(item))
                     else:
                         out[k].append(item)
             else:
                 out[k] = v
         return out
     def xml_to_dict(result):
         """Converts AXEL simple XML responses into dict()"""
         d = {}

     from suds.client import Client
     from suds.transport.http import HttpAuthenticated
     from suds.transport import Reply
     from suds.sudsobject import asdict
     class Transport(HttpAuthenticated):
-...
                               domains=self.domains),
                           plugins=self.plugins,
                           cache=self.cache)
     def client_to_jsondict(client):
         """return description of the client, as dict (for json export)"""
         res = {}
         for i, sd in enumerate(client.sd):
             d = {}
             d['tns'] = sd.wsdl.tns[1]
             d['prefixes'] = dict(p for p in sd.prefixes)
             d['ports'] = {}
             for p in sd.ports:
                 d['ports'][p[0].name] = {}
                 for m in p[1]:
                     d['ports'][p[0].name][m[0]] = dict(
                             (mp[0], sd.xlate(mp[1])) for mp in m[1])
             d['types'] = {}
             for t in sd.types:
                 ft = client.factory.create(sd.xlate(t[0]))
                 d['types'][sd.xlate(t[0])] = unicode(ft)
             res[sd.service.name] = d
         return res
     def recursive_asdict(d):
         """Convert Suds object into serializable format."""
         out = {}
         for k, v in asdict(d).iteritems():
             if hasattr(v, '__keylist__'):
                 out[k] = recursive_asdict(v)
             elif isinstance(v, list):
                 out[k] = []
                 for item in v:
                     if hasattr(item, '__keylist__'):
                         out[k].append(recursive_asdict(item))
                     else:
                         out[k].append(item)
             else:
                 out[k] = v
         return out
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-misc-move-duplicated-soap-utility-functions-to-main-.patch