From 791eedd3f550f5532dc68ba24b5a19572773e2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20NO=C3=8BL?= <tnoel@entrouvert.com>
Date: Wed, 1 Feb 2023 13:55:49 +0100
Subject: [PATCH] misc: fix new pylint 2.16 warnings (#74060)

---
 passerelle/apps/soap/models.py | 14 +++++++-------
 passerelle/base/models.py      |  4 ++--
 pylint.rc                      |  1 +
 tests/test_actesweb.py         |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/passerelle/apps/soap/models.py b/passerelle/apps/soap/models.py
index 69bb94e7..e551fc6e 100644
--- a/passerelle/apps/soap/models.py
+++ b/passerelle/apps/soap/models.py
@@ -148,12 +148,12 @@ class SOAPConnector(BaseResource, HTTPResource):
             return endpoints
 
         for name, input_schema, output_schema in operations_and_schemas:
-            kwargs = dict(
-                name='method',
-                pattern=f'{name}/',
-                example_pattern=f'{name}/',
-                description=f'Method {name}',
-                json_schema_response={
+            kwargs = {
+                'name': 'method',
+                'pattern': f'{name}/',
+                'example_pattern': f'{name}/',
+                'description': f'Method {name}',
+                'json_schema_response': {
                     'type': 'object',
                     'properties': collections.OrderedDict(
                         [
@@ -162,7 +162,7 @@ class SOAPConnector(BaseResource, HTTPResource):
                         ]
                     ),
                 },
-            )
+            }
             if input_schema:
                 kwargs['post_json_schema'] = input_schema
             endpoints.append(endpoint(**kwargs))
diff --git a/passerelle/base/models.py b/passerelle/base/models.py
index f4b9e940..0edb01ee 100644
--- a/passerelle/base/models.py
+++ b/passerelle/base/models.py
@@ -205,8 +205,8 @@ class BaseResource(models.Model):
         return self._requests
 
     def make_requests(self, **kwargs):
-        init_kwargs = dict(resource=self, logger=self.logger)
-        init_kwargs = dict(init_kwargs, **kwargs)
+        init_kwargs = {'resource': self, 'logger': self.logger}
+        init_kwargs.update(kwargs)
         return passerelle.utils.Request(**init_kwargs)
 
     @property
diff --git a/pylint.rc b/pylint.rc
index 3c2150c3..234d4a18 100644
--- a/pylint.rc
+++ b/pylint.rc
@@ -10,6 +10,7 @@ disable=
     attribute-defined-outside-init,
     bad-super-call,
     broad-except,
+    broad-exception-raised,
     consider-using-f-string,
     consider-using-set-comprehension,
     consider-using-ternary,
diff --git a/tests/test_actesweb.py b/tests/test_actesweb.py
index c1ae4c50..7900ce34 100644
--- a/tests/test_actesweb.py
+++ b/tests/test_actesweb.py
@@ -72,7 +72,7 @@ def test_demand_creation(app, payload, actesweb):
         demfile = get_demand_filepath(actesweb, demand_id)
         assert_file_content_values(
             demfile,
-            dict(
+            dict(  # noqa pylint: disable=use-dict-literal
                 DEMANDEUR_CIVILITE="Madame",
                 DEMANDEUR_NOM_USAGE="W'hatever?",
                 DEMANDEUR_PRENOMS="Kim Chelsea",
@@ -102,7 +102,7 @@ def test_demand_creation(app, payload, actesweb):
         demfile = get_demand_filepath(actesweb, demand_id)
         assert_file_content_values(
             demfile,
-            dict(
+            dict(  # noqa pylint: disable=use-dict-literal
                 DEMANDEUR_CIVILITE="Madame",
                 DEMANDEUR_NOM_USAGE="Whatever",
                 DEMANDEUR_NOM="Bar",
@@ -146,7 +146,7 @@ def test_demand_creation(app, payload, actesweb):
         assert not bool(os.stat(demfile).st_mode & stat.S_IRWXO)
         assert_file_content_values(
             demfile,
-            dict(
+            dict(  # noqa pylint: disable=use-dict-literal
                 DEMANDEUR_CIVILITE="Madame",
                 DEMANDEUR_NOM_USAGE="Whatever",
                 DEMANDEUR_PRENOMS="Kim Chelsea",