flake8: fix unused local variables (F841)

Author: bajnokk

src/satosa/backends/apple.py

@@ -210,7 +210,7 @@ def response_endpoint(self, context, *args):
         try:
             userdata = context.request.get("user", "{}")
             userinfo = json.load(userdata)
-        except Exception as e:
+        except Exception:
             userinfo = {}
 
         authn_resp = self.client.parse_response(

src/satosa/backends/oauth.py

@@ -259,7 +259,7 @@ def user_information(self, access_token):
         try:
             picture_url = data["picture"]["data"]["url"]
             data["picture"] = picture_url
-        except KeyError as e:
+        except KeyError:
             pass
         return data
 

src/satosa/base.py

@@ -200,7 +200,7 @@ def _load_state(self, context):
                 self.config["COOKIE_STATE_NAME"],
                 self.config["STATE_ENCRYPTION_KEY"],
             )
-        except SATOSAStateError as e:
+        except SATOSAStateError:
             state = State()
         finally:
             context.state = state

src/satosa/frontends/saml2.py

@@ -173,10 +173,8 @@ def _validate_config(self, config):
             raise ValueError("No configuration given")
 
         for key in required_keys:
-            try:
-                _val = config[key]
-            except KeyError as e:
-                raise ValueError("Missing configuration key: %s" % key) from e
+            if key not in config:
+                raise ValueError("Missing configuration key: %s" % key)
 
     def _handle_authn_request(self, context, binding_in, idp):
         """
@@ -630,7 +628,7 @@ def _get_sp_display_name(self, idp, entity_id):
 
         try:
             return extensions[0]["display_name"]
-        except (IndexError, KeyError) as e:
+        except (IndexError, KeyError):
             pass
 
         return None

src/satosa/micro_services/consent.py

@@ -66,7 +66,7 @@ def _handle_consent_response(self, context):
         except ConnectionError as e:
             msg = "Consent service is not reachable, no consent given."
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.error(logline)
+            logger.error(logline, exc_info=e)
             # Send an internal_response without any attributes
             consent_attributes = None
 
@@ -136,7 +136,7 @@ def process(self, context, internal_response):
         except requests.exceptions.ConnectionError as e:
             msg = "Consent service is not reachable, no consent is given."
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.error(logline)
+            logger.error(logline, exc_info=e)
             # Send an internal_response without any attributes
             internal_response.attributes = {}
             return self._end_consent(context, internal_response)

src/satosa/micro_services/custom_logging.py

@@ -39,7 +39,7 @@ def process(self, context, data):
         try:
             spEntityID = context.state.state_dict['SATOSA_BASE']['requester']
             idpEntityID = data.auth_info.issuer
-        except KeyError as err:
+        except KeyError:
             msg = "{} Unable to determine the entityID's for the IdP or SP".format(logprefix)
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)
@@ -71,8 +71,6 @@ def process(self, context, data):
             logger.error(logline)
             return super().process(context, data)
 
-        record = None
-
         try:
             msg = "{} Using context {}".format(logprefix, context)
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)

src/satosa/micro_services/primary_identifier.py

@@ -138,7 +138,7 @@ def process(self, context, data):
         # Find the entityID for the SP that initiated the flow
         try:
             spEntityID = context.state.state_dict['SATOSA_BASE']['requester']
-        except KeyError as err:
+        except KeyError:
             msg = "{} Unable to determine the entityID for the SP requester".format(logprefix)
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)
@@ -151,7 +151,7 @@ def process(self, context, data):
         # Find the entityID for the IdP that issued the assertion
         try:
             idpEntityID = data.auth_info.issuer
-        except KeyError as err:
+        except KeyError:
             msg = "{} Unable to determine the entityID for the IdP issuer".format(logprefix)
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)

tests/satosa/frontends/test_openid_connect.py

@@ -557,7 +557,7 @@ def test_full_flow(self, context, frontend_with_extra_scopes):
         frontend_with_extra_scopes.auth_req_callback_func = mock_callback
         # discovery
         http_response = frontend_with_extra_scopes.provider_config(context)
-        provider_config = ProviderConfigurationResponse().deserialize(http_response.message, "json")
+        _ = ProviderConfigurationResponse().deserialize(http_response.message, "json")
 
         # client registration
         registration_request = RegistrationRequest(redirect_uris=[redirect_uri], response_types=[response_type])

tests/satosa/micro_services/test_attribute_authorization.py

@@ -1,3 +1,4 @@
+import pytest
 from satosa.internal import AuthenticationInformation
 from satosa.internal import InternalData
 from satosa.micro_services.attribute_authorization import AttributeAuthorization
@@ -25,7 +26,7 @@ def test_authz_allow_success(self):
            ctx = Context()
            ctx.state = dict()
            authz_service.process(ctx, resp)
-        except SATOSAAuthenticationError as ex:
+        except SATOSAAuthenticationError:
            assert False
 
     def test_authz_allow_fail(self):
@@ -38,13 +39,10 @@ def test_authz_allow_fail(self):
         resp.attributes = {
             "a0": ["bar"],
         }
-        try:
+        with pytest.raises(SATOSAAuthenticationError):
            ctx = Context()
            ctx.state = dict()
            authz_service.process(ctx, resp)
-           assert False
-        except SATOSAAuthenticationError as ex:
-           assert True
 
     def test_authz_allow_second(self):
         attribute_allow = {
@@ -60,7 +58,7 @@ def test_authz_allow_second(self):
            ctx = Context()
            ctx.state = dict()
            authz_service.process(ctx, resp)
-        except SATOSAAuthenticationError as ex:
+        except SATOSAAuthenticationError:
            assert False
 
     def test_authz_deny_success(self):
@@ -73,13 +71,10 @@ def test_authz_deny_success(self):
         resp.attributes = {
             "a0": ["foo2"],
         }
-        try:
+        with pytest.raises(SATOSAAuthenticationError):
            ctx = Context()
            ctx.state = dict()
            authz_service.process(ctx, resp)
-           assert False
-        except SATOSAAuthenticationError as ex:
-           assert True
 
     def test_authz_deny_fail(self):
         attribute_deny = {
@@ -95,5 +90,5 @@ def test_authz_deny_fail(self):
            ctx = Context()
            ctx.state = dict()
            authz_service.process(ctx, resp)
-        except SATOSAAuthenticationError as ex:
+        except SATOSAAuthenticationError:
            assert False

tox.ini

@@ -46,7 +46,6 @@ ignore =
   E302
   E303
   E703
-  F841
   W291
   W292
   W293