From 756f8c9e0148c7d809008c3c40dd347f875da846 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 19 Nov 2019 10:51:13 +0100 Subject: [PATCH 1/8] 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(-) diff --git a/passerelle/apps/cartads_cs/models.py b/passerelle/apps/cartads_cs/models.py index 523640e2..9acf8884 100644 --- a/passerelle/apps/cartads_cs/models.py +++ b/passerelle/apps/cartads_cs/models.py @@ -315,7 +315,7 @@ class AbstractCartaDSCS(BaseResource): dossier.cartads_cache_code_acces = client_suivi.service.GetMotPasse( self.get_token(), dossier.cartads_id_dossier) except zeep.exceptions.Fault as e: - self.logger.exception('error getting access code (%s) (%r)', dossier.id, e.message) + self.logger.exception('error getting access code (%s) (%s)', dossier.id, e) try: infos_dossier = client_dossier.service.GetInfosDossier(self.get_token(), dossier.cartads_id_dossier) if infos_dossier: @@ -323,7 +323,7 @@ class AbstractCartaDSCS(BaseResource): dossier.cartads_cache_infos = json.loads(json.dumps( zeep_helpers.serialize_object(infos_dossier), cls=JSONEncoder)) except zeep.exceptions.Fault as e: - self.logger.exception('error getting dossier infos (%s) (%r)', dossier.id, e.message) + self.logger.exception('error getting dossier infos (%s) (%s)', dossier.id, e) dossier.save() self.sync_subscribers_role(dossier) @@ -856,7 +856,7 @@ class AbstractCartaDSCS(BaseResource): {'idDosPiece': id_dos_piece}), }) except zeep.exceptions.Fault as e: - self.logger.exception('error pushing file item %d (%r)', piece.id, e.message) + self.logger.exception('error pushing file item %d (%s)', piece.id, e) continue else: assert resp is None @@ -898,7 +898,7 @@ class AbstractCartaDSCS(BaseResource): ), }) except zeep.exceptions.Fault as e: - self.logger.exception('error pushing file item %d (%r)', piece.id, e.message) + self.logger.exception('error pushing file item %d (%s)', piece.id, e) else: assert resp is None piece.sent_to_cartads = now() @@ -945,7 +945,7 @@ class AbstractCartaDSCS(BaseResource): 'InformationsComplementaires': key_value_of_stringstring(infos) }) except zeep.exceptions.Fault as e: - self.logger.exception('error pushing daact file item %d (%r)', piece.id, e.message) + self.logger.exception('error pushing daact file item %d (%s)', piece.id, e) else: assert resp is None piece.sent_to_cartads = now() @@ -1067,7 +1067,7 @@ class AbstractCartaDSCS(BaseResource): dossier_number, dossier_password) except zeep.exceptions.Fault as e: - self.logger.error('error joining dossier %s (%r)', dossier_number, e.message) + self.logger.error('error joining dossier %s (%s)', dossier_number, e) raise APIError('error joining dossier (wrong password?)') id_dossier = int(resp) dossier, created = CartaDSDossier.objects.get_or_create(cartads_id_dossier=id_dossier) diff --git a/passerelle/apps/cityweb/cityweb.py b/passerelle/apps/cityweb/cityweb.py index df2d20d5..3439962c 100644 --- a/passerelle/apps/cityweb/cityweb.py +++ b/passerelle/apps/cityweb/cityweb.py @@ -130,7 +130,7 @@ class DateType(CityWebType): try: self.value = parse_date(value) except (ValueError,) as exc: - raise APIError('Invalid date (%s) for <%s>: %s' % (value, self.tagname, exc.message)) + raise APIError('Invalid date (%s) for <%s>: %s' % (value, self.tagname, exc)) if not self.value: raise APIError('Invalid date (%s) for <%s>' % (value, self.tagname)) self.value = self.value.isoformat() diff --git a/passerelle/contrib/agoraplus/views.py b/passerelle/contrib/agoraplus/views.py index b7ff3f5d..cb7e20f4 100644 --- a/passerelle/contrib/agoraplus/views.py +++ b/passerelle/contrib/agoraplus/views.py @@ -647,7 +647,7 @@ class PhoneUpdateView(PostFormdataView): return self.object.update_phone_numbers(self.login, self.name_id, adult_id, new_phone_number, new_cellphone_number) except ObjectDoesNotExist, e: - raise Http404(e.message) + raise Http404(str(e)) class ProfessionUpdateView(PostFormdataView): @@ -663,4 +663,4 @@ class ProfessionUpdateView(PostFormdataView): new_profession, new_pcs, new_employer_name, new_employer_city, new_employer_phone) except ObjectDoesNotExist, e: - raise Http404(e.message) + raise Http404(str(e)) diff --git a/passerelle/contrib/dpark/models.py b/passerelle/contrib/dpark/models.py index 0a4fe342..67741336 100644 --- a/passerelle/contrib/dpark/models.py +++ b/passerelle/contrib/dpark/models.py @@ -202,9 +202,9 @@ class DPark(BaseResource): try: reply = getattr(proxy_service, operation)(*args, **kwargs) except (WebFault, ) as exc: - raise APIError('ServiceError: %s' % exc.message) + raise APIError('ServiceError: %s' % exc) except (Exception,) as exc: - raise APIError('Error: %s' % exc.message) + raise APIError('Error: %s' % exc) reply_code = getattr(reply, 'CodeRetour', None) or getattr(reply, 'Code_Retour', None) reply_message = getattr(reply, 'MessageRetour', None) or getattr(reply, 'Lib_Retour', None) if reply_code != '01' and not bypass_erroneous_reply: @@ -435,7 +435,7 @@ class DPark(BaseResource): try: data = json.loads(request.body) except ValueError as exc: - raise APIError(exc.message, http_status=400) + raise APIError(str(exc), http_status=400) is_erroneous(data, ('application_external_id', 'application_id')) application_external_id = data.pop('application_external_id') diff --git a/passerelle/contrib/greco/formdata.py b/passerelle/contrib/greco/formdata.py index 08bea863..f189344c 100644 --- a/passerelle/contrib/greco/formdata.py +++ b/passerelle/contrib/greco/formdata.py @@ -105,7 +105,7 @@ class FormData(object): try: value = modifier(value) except ValueError as e: - raise ValueError('%s: %s' % (fieldname[0], e.message)) + raise ValueError('%s: %s' % (fieldname[0], e)) fieldname = fieldname[0] else: value = values.get(fieldname) diff --git a/passerelle/contrib/greco/models.py b/passerelle/contrib/greco/models.py index 8cbfa3e9..f731866a 100644 --- a/passerelle/contrib/greco/models.py +++ b/passerelle/contrib/greco/models.py @@ -199,7 +199,7 @@ class Greco(BaseResource): try: formdata = FormData(json.loads(request.body), CREATION_SCHEMA) except ValueError as e: - raise ParameterTypeError(e.message) + raise ParameterTypeError(str(e)) # create suds object from formdata client = self.get_client(formdata.attachments) creation = client.factory.create('DemandeCreation') diff --git a/passerelle/contrib/teamnet_axel/models.py b/passerelle/contrib/teamnet_axel/models.py index 7c763fcf..29cbf2d4 100644 --- a/passerelle/contrib/teamnet_axel/models.py +++ b/passerelle/contrib/teamnet_axel/models.py @@ -170,7 +170,7 @@ class TeamnetAxel(BaseResource): try: client = soap.get_client(self) except (Exception, ) as exc: - raise APIError('Client Error: %s' % exc.message) + raise APIError('Client Error: %s' % exc) res = {'ping': 'pong'} if 'debug' in request.GET: res['client'] = client_to_jsondict(client) -- 2.23.0