Projet

Général

Profil

0001-misc-fix-BaseException.message-deprecation-warning-3.patch

Benjamin Dauvergne, 19 novembre 2019 19:10

Télécharger (8,62 ko)

Voir les différences:

Subject: [PATCH 1/6] misc: fix BaseException.message deprecation warning
 (#37760)

 passerelle/apps/cartads_cs/models.py      | 12 ++++++------
 passerelle/apps/cityweb/cityweb.py        |  2 +-
 passerelle/contrib/agoraplus/views.py     |  4 ++--
 passerelle/contrib/dpark/models.py        |  6 +++---
 passerelle/contrib/greco/formdata.py      |  2 +-
 passerelle/contrib/greco/models.py        |  2 +-
 passerelle/contrib/teamnet_axel/models.py |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
passerelle/apps/cartads_cs/models.py
315 315
                dossier.cartads_cache_code_acces = client_suivi.service.GetMotPasse(
316 316
                        self.get_token(), dossier.cartads_id_dossier)
317 317
            except zeep.exceptions.Fault as e:
318
                self.logger.exception('error getting access code (%s) (%r)', dossier.id, e.message)
318
                self.logger.exception('error getting access code (%s) (%s)', dossier.id, e)
319 319
            try:
320 320
                infos_dossier = client_dossier.service.GetInfosDossier(self.get_token(), dossier.cartads_id_dossier)
321 321
                if infos_dossier:
......
323 323
                    dossier.cartads_cache_infos = json.loads(json.dumps(
324 324
                        zeep_helpers.serialize_object(infos_dossier), cls=JSONEncoder))
325 325
            except zeep.exceptions.Fault as e:
326
                self.logger.exception('error getting dossier infos (%s) (%r)', dossier.id, e.message)
326
                self.logger.exception('error getting dossier infos (%s) (%s)', dossier.id, e)
327 327
            dossier.save()
328 328
            self.sync_subscribers_role(dossier)
329 329

  
......
856 856
                                    {'idDosPiece': id_dos_piece}),
857 857
                            })
858 858
                except zeep.exceptions.Fault as e:
859
                    self.logger.exception('error pushing file item %d (%r)', piece.id, e.message)
859
                    self.logger.exception('error pushing file item %d (%s)', piece.id, e)
860 860
                    continue
861 861
                else:
862 862
                    assert resp is None
......
898 898
                        ),
899 899
            })
900 900
        except zeep.exceptions.Fault as e:
901
            self.logger.exception('error pushing file item %d (%r)', piece.id, e.message)
901
            self.logger.exception('error pushing file item %d (%s)', piece.id, e)
902 902
        else:
903 903
            assert resp is None
904 904
            piece.sent_to_cartads = now()
......
945 945
                                'InformationsComplementaires': key_value_of_stringstring(infos)
946 946
                    })
947 947
                except zeep.exceptions.Fault as e:
948
                    self.logger.exception('error pushing daact file item %d (%r)', piece.id, e.message)
948
                    self.logger.exception('error pushing daact file item %d (%s)', piece.id, e)
949 949
                else:
950 950
                    assert resp is None
951 951
                    piece.sent_to_cartads = now()
......
1067 1067
                    dossier_number,
1068 1068
                    dossier_password)
1069 1069
        except zeep.exceptions.Fault as e:
1070
            self.logger.error('error joining dossier %s (%r)', dossier_number, e.message)
1070
            self.logger.error('error joining dossier %s (%s)', dossier_number, e)
1071 1071
            raise APIError('error joining dossier (wrong password?)')
1072 1072
        id_dossier = int(resp)
1073 1073
        dossier, created = CartaDSDossier.objects.get_or_create(cartads_id_dossier=id_dossier)
passerelle/apps/cityweb/cityweb.py
130 130
        try:
131 131
            self.value = parse_date(value)
132 132
        except (ValueError,) as exc:
133
            raise APIError('Invalid date (%s) for <%s>: %s' % (value, self.tagname, exc.message))
133
            raise APIError('Invalid date (%s) for <%s>: %s' % (value, self.tagname, exc))
134 134
        if not self.value:
135 135
            raise APIError('Invalid date (%s) for <%s>' % (value, self.tagname))
136 136
        self.value = self.value.isoformat()
passerelle/contrib/agoraplus/views.py
647 647
            return self.object.update_phone_numbers(self.login, self.name_id, adult_id,
648 648
                            new_phone_number, new_cellphone_number)
649 649
        except ObjectDoesNotExist, e:
650
            raise Http404(e.message)
650
            raise Http404(str(e))
651 651

  
652 652

  
653 653
class ProfessionUpdateView(PostFormdataView):
......
663 663
                    new_profession, new_pcs, new_employer_name,
664 664
                    new_employer_city, new_employer_phone)
665 665
        except ObjectDoesNotExist, e:
666
            raise Http404(e.message)
666
            raise Http404(str(e))
passerelle/contrib/dpark/models.py
202 202
        try:
203 203
            reply = getattr(proxy_service, operation)(*args, **kwargs)
204 204
        except (WebFault, ) as exc:
205
            raise APIError('ServiceError: %s' % exc.message)
205
            raise APIError('ServiceError: %s' % exc)
206 206
        except (Exception,) as exc:
207
            raise APIError('Error: %s' % exc.message)
207
            raise APIError('Error: %s' % exc)
208 208
        reply_code = getattr(reply, 'CodeRetour', None) or getattr(reply, 'Code_Retour', None)
209 209
        reply_message = getattr(reply, 'MessageRetour', None) or getattr(reply, 'Lib_Retour', None)
210 210
        if reply_code != '01' and not bypass_erroneous_reply:
......
435 435
        try:
436 436
            data = json.loads(request.body)
437 437
        except ValueError as exc:
438
            raise APIError(exc.message, http_status=400)
438
            raise APIError(str(exc), http_status=400)
439 439

  
440 440
        is_erroneous(data, ('application_external_id', 'application_id'))
441 441
        application_external_id = data.pop('application_external_id')
passerelle/contrib/greco/formdata.py
105 105
                    try:
106 106
                        value = modifier(value)
107 107
                    except ValueError as e:
108
                        raise ValueError('%s: %s' % (fieldname[0], e.message))
108
                        raise ValueError('%s: %s' % (fieldname[0], e))
109 109
                fieldname = fieldname[0]
110 110
            else:
111 111
                value = values.get(fieldname)
passerelle/contrib/greco/models.py
199 199
        try:
200 200
            formdata = FormData(json.loads(request.body), CREATION_SCHEMA)
201 201
        except ValueError as e:
202
            raise ParameterTypeError(e.message)
202
            raise ParameterTypeError(str(e))
203 203
        # create suds object from formdata
204 204
        client = self.get_client(formdata.attachments)
205 205
        creation = client.factory.create('DemandeCreation')
passerelle/contrib/teamnet_axel/models.py
170 170
        try:
171 171
            client = soap.get_client(self)
172 172
        except (Exception, ) as exc:
173
            raise APIError('Client Error: %s' % exc.message)
173
            raise APIError('Client Error: %s' % exc)
174 174
        res = {'ping': 'pong'}
175 175
        if 'debug' in request.GET:
176 176
            res['client'] = client_to_jsondict(client)
177
-