Merge pull request #424 from bajnokk/flake8

Flake8 non-formatting changes

Author: c00kiemon5ter

src/satosa/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """SATOSA: An any to any Single Sign On (SSO) proxy."""
 
-from .version import version as __version__
+from .version import version as __version__  # noqa: F401

src/satosa/backends/apple.py

@@ -22,7 +22,6 @@
 from ..exception import SATOSAAuthenticationError, SATOSAError
 from ..response import Redirect
 
-import base64
 import json
 import requests
 
@@ -211,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/backends/reflector.py

@@ -1,6 +1,7 @@
 """
 A reflector backend module for the satosa proxy
 """
+import base64
 from datetime import datetime
 
 from satosa.internal import AuthenticationInformation
@@ -74,7 +75,7 @@ def get_metadata_desc(self):
         """
         entity_descriptions = []
         description = MetadataDescription(
-            urlsafe_b64encode(ReflectorBackend.ENTITY_ID.encode("utf-8")).decode(
+            base64.urlsafe_b64encode(ReflectorBackend.ENTITY_ID.encode("utf-8")).decode(
                 "utf-8"
             )
         )

src/satosa/base.py

@@ -9,7 +9,6 @@
 
 from satosa import util
 from .context import Context
-from .exception import SATOSAConfigurationError
 from .exception import SATOSAError, SATOSAAuthenticationError, SATOSAUnknownError
 from .plugin_loader import load_backends, load_frontends
 from .plugin_loader import load_request_microservices, load_response_microservices
@@ -201,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/ping.py

@@ -2,7 +2,6 @@
 
 import satosa.logging_util as lu
 import satosa.micro_services.base
-from satosa.logging_util import satosa_logging
 from satosa.response import Response
 
 

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/attribute_processor.py

@@ -1,5 +1,4 @@
 import importlib
-import json
 import logging
 
 from satosa.exception import SATOSAError

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)