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

Frédéric Péters, 10 octobre 2018 10:01

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/greco/models.py          | 17 +--------
 passerelle/contrib/maarch/soap.py           | 40 +--------------------
 passerelle/contrib/maarch/views.py          |  7 ++--
 passerelle/contrib/seisin_by_email/soap.py  | 38 --------------------
 passerelle/contrib/seisin_by_email/views.py |  7 ++--
 passerelle/contrib/teamnet_axel/models.py   |  3 +-
 passerelle/contrib/teamnet_axel/soap.py     | 40 ---------------------
 passerelle/soap.py                          | 39 ++++++++++++++++++++
 8 files changed, 51 insertions(+), 140 deletions(-)

     from passerelle.base.models import BaseResource
     from passerelle.utils.api import endpoint, APIError
     from passerelle.soap import sudsobject_to_dict
     from .formdata import FormData, CREATION_SCHEMA, list_schema_fields
-...
                     # sudsobject.foo.bar <- fields['foo_bar']
                     setattr(sudsobject, key, fields[attr])
     def sudsobject_to_dict(sudsobject):
         out = {}
         for key, value in suds.sudsobject.asdict(sudsobject).iteritems():
             if hasattr(value, '__keylist__'):
                 out[key] = sudsobject_to_dict(value)
             elif isinstance(value, list):
                 out[key] = []
                 for item in value:
                     if hasattr(item, '__keylist__'):
                         out[key].append(sudsobject_to_dict(item))
                     else:
                         out[key].append(item)
             else:
                 out[key] = value
         return out
     class Greco(BaseResource):
         application = models.CharField(_('Application identifier'), max_length=200)

     from suds.transport.http import HttpAuthenticated
     from suds.transport import Reply
     from suds.client import Client
     from suds.sudsobject import asdict
     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 django.views.decorators.csrf import csrf_exempt
     from passerelle import utils
     from passerelle.soap import sudsobject_to_dict, sudsclient_to_jsondict
     from .soap import get_client, client_to_jsondict, recursive_asdict
     from .soap import get_client
     from .models import Maarch
     logger = logging.getLogger('passerelle.contrib.maarch')
-...
             client = self.get_client()
             res = {'ping': 'pong'}
             if 'debug' in request.GET:
                 res['client'] = client_to_jsondict(client)
                 res['client'] = sudsclient_to_jsondict(client)
             return res
-...
                 results = client.service.storeResource(
                         encodedFile, metadata, collId,
                         table, fileFormat, status)
             data = recursive_asdict(results)
             data = sudsobject_to_dict(results)
             logger.debug('storeResource result: %r', data)
             resId = data.get('resId')

     from suds.transport.http import HttpAuthenticated
     from suds.transport import Reply
     from suds.client import Client
     from suds.sudsobject import asdict
     class Transport(HttpAuthenticated):
-...
     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 django.views.decorators.csrf import csrf_exempt
     from passerelle import utils
     from passerelle.soap import sudsobject_to_dict, sudsclient_to_jsondict
     from .soap import get_client, client_to_jsondict, recursive_asdict
     from .soap import get_client
     from .models import SeisinByEmailManagement
-...
             client = self.get_client()
             res = {'ping': 'pong'}
             if 'debug' in request.GET:
                 res['client'] = client_to_jsondict(client)
                 res['client'] = sudsclient_to_jsondict(client)
             return res
-...
                                                        request_object,
                                                        data,
                                                        attachmentData)
             data = recursive_asdict(results)
             data = sudsobject_to_dict(results)
             if debug:
                 data['debug'] = debug_output

     from jsonfield import JSONField
     from passerelle.base.models import BaseResource
     from passerelle.soap import sudsclient_to_jsondict
     from passerelle.utils.api import endpoint
     from passerelle.utils.jsonresponse import APIError
     from passerelle.views import WrongParameter
-...
                 raise APIError('Client Error: %s' % exc.message)
             res = {'ping': 'pong'}
             if 'debug' in request.GET:
                 res['client'] = soap.client_to_jsondict(client)
                 res['client'] = sudsclient_to_jsondict(client)
             return {'data': res}
         @endpoint(perm='can_access')

     from suds.transport.http import HttpAuthenticated
     from suds.transport import Reply
     from suds.client import Client
     from suds.sudsobject import asdict
     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
     import suds.sudsobject
     class Transport(HttpAuthenticated):
-...
                               domains=self.domains),
                           plugins=self.plugins,
                           cache=self.cache)
     def sudsclient_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 sudsobject_to_dict(sudsobject):
         out = {}
         for key, value in suds.sudsobject.asdict(sudsobject).iteritems():
             if hasattr(value, '__keylist__'):
                 out[key] = sudsobject_to_dict(value)
             elif isinstance(value, list):
                 out[key] = []
                 for item in value:
                     if hasattr(item, '__keylist__'):
                         out[key].append(sudsobject_to_dict(item))
                     else:
                         out[key].append(item)
             else:
                 out[key] = value
         return out
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

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