fix PEP-8 violations in src/satosa excluding subdirs

checking tool: flake8 --max-line-length 119

Author: rhoerbe

src/satosa/attribute_mapping.py

@@ -98,7 +98,7 @@ def to_internal(self, attribute_profile, external_dict):
                                                                                 external_dict)
             if attribute_values:  # Only insert key if it has some values
                 logger.debug("backend attribute '%s' mapped to %s" % (external_attribute_name,
-                                                            internal_attribute_name))
+                                                                      internal_attribute_name))
                 internal_dict[internal_attribute_name] = attribute_values
             else:
                 logger.debug("skipped backend attribute '%s': no value found", external_attribute_name)
@@ -122,7 +122,7 @@ def _render_attribute_template(self, template, data):
         t = Template(template, cache_enabled=True, imports=["from satosa.attribute_mapping import scope"])
         try:
             return t.render(**data).split(self.multivalue_separator)
-        except (NameError, TypeError) as e:
+        except (NameError, TypeError):
             return []
 
     def _handle_template_attributes(self, attribute_profile, internal_dict):
@@ -187,8 +187,7 @@ def from_internal(self, attribute_profile, internal_dict):
             if attribute_profile not in attribute_mapping:
                 # skip this internal attribute if we have no mapping in the specified profile
                 logger.debug("no mapping found for '%s' in attribute profile '%s'" %
-                             (internal_attribute_name,
-                             attribute_profile))
+                             (internal_attribute_name, attribute_profile))
                 continue
 
             external_attribute_names = self.from_internal_attributes[internal_attribute_name][attribute_profile]

src/satosa/base.py

@@ -72,10 +72,11 @@ def __init__(self, config):
         self.request_micro_services = []
         logger.info("Loading micro services...")
         if "MICRO_SERVICES" in self.config:
-            self.request_micro_services.extend(load_request_microservices(self.config.get("CUSTOM_PLUGIN_MODULE_PATHS"),
-                                                                          self.config["MICRO_SERVICES"],
-                                                                          self.config["INTERNAL_ATTRIBUTES"],
-                                                                          self.config["BASE"]))
+            self.request_micro_services.extend(load_request_microservices(
+                self.config.get("CUSTOM_PLUGIN_MODULE_PATHS"),
+                self.config["MICRO_SERVICES"],
+                self.config["INTERNAL_ATTRIBUTES"],
+                self.config["BASE"]))
             self._link_micro_services(self.request_micro_services, self._auth_req_finish)
 
             self.response_micro_services.extend(

src/satosa/context.py

@@ -8,12 +8,9 @@ class SATOSABadContextError(SATOSAError):
     pass
 
 
-"""
-Holds methods for sending internal data through the satosa proxy
-"""
 class Context(object):
     """
-    Holds information about the current request.
+    Holds methods for sharing proxy data through the current request
     """
     KEY_BACKEND_METADATA_STORE = 'metadata_store'
     KEY_TARGET_ENTITYID = 'target_entity_id'

src/satosa/deprecated.py

@@ -93,7 +93,7 @@ class UserIdHashType(Enum):
     unspecified = 6
 
     def __getattr__(self, name):
-        if name is not "_value_":
+        if name != "_value_":
             msg = "UserIdHashType is deprecated and will be removed."
             _warnings.warn(msg, DeprecationWarning)
         return self.__getattribute__(name)

src/satosa/internal_data.py

@@ -1,12 +1,5 @@
 import warnings as _warnings
 
-from satosa.internal import InternalData
-from satosa.internal import AuthenticationInformation
-from satosa.deprecated import UserIdHashType
-from satosa.deprecated import UserIdHasher
-from satosa.deprecated import InternalRequest
-from satosa.deprecated import InternalResponse
-
 
 _warnings.warn(
     "internal_data is deprecated; use satosa.internal instead.",

src/satosa/metadata_creation/description.py

@@ -91,7 +91,7 @@ def add_logo(self, text, width, height, lang=None):
         :param lang: language
         """
 
-        logo_entry ={"text": text, "width": width, "height": height}
+        logo_entry = {"text": text, "width": width, "height": height}
         if lang:
             logo_entry["lang"] = lang
         self._logos.append(logo_entry)

src/satosa/metadata_creation/saml_metadata.py

@@ -74,14 +74,9 @@ def _create_frontend_metadata(frontend_modules, backend_modules):
                 for co_name in co_names:
                     logger.info("Creating metadata for CO {}".format(co_name))
                     idp_config = copy.deepcopy(frontend.config["idp_config"])
-                    idp_config = frontend._add_endpoints_to_config(
-                                     idp_config,
-                                     co_name,
-                                     backend.name)
+                    idp_config = frontend._add_endpoints_to_config(idp_config, co_name, backend.name)
                     idp_config = frontend._add_entity_id(idp_config, co_name)
-                    idp_config = frontend._overlay_for_saml_metadata(
-                                     idp_config,
-                                     co_name)
+                    idp_config = frontend._overlay_for_saml_metadata(idp_config, co_name)
                     entity_desc = _create_entity_descriptor(idp_config)
                     frontend_metadata[frontend.name].append(entity_desc)
 

src/satosa/plugin_loader.py

@@ -41,8 +41,11 @@ def load_backends(config, callback, internal_attributes):
     :param callback: Function that will be called by the backend after the authentication is done.
     :return: A list of backend modules
     """
-    backend_modules = _load_plugins(config.get("CUSTOM_PLUGIN_MODULE_PATHS"), config["BACKEND_MODULES"], backend_filter,
-                                    config["BASE"], internal_attributes, callback)
+    backend_modules = _load_plugins(
+        config.get("CUSTOM_PLUGIN_MODULE_PATHS"),
+        config["BACKEND_MODULES"],
+        backend_filter, config["BASE"],
+        internal_attributes, callback)
     logger.info("Setup backends: %s" % [backend.name for backend in backend_modules])
     return backend_modules
 
@@ -184,7 +187,8 @@ def _load_plugins(plugin_paths, plugins, plugin_filter, base_url, internal_attri
 def _load_endpoint_module(plugin_config, plugin_filter):
     _mandatory_params = ("name", "module", "config")
     if not all(k in plugin_config for k in _mandatory_params):
-        raise SATOSAConfigurationError("Missing mandatory plugin configuration parameter: {}".format(_mandatory_params))
+        raise SATOSAConfigurationError(
+            "Missing mandatory plugin configuration parameter: {}".format(_mandatory_params))
 
     return _load_plugin_module(plugin_config, plugin_filter)
 
@@ -202,7 +206,8 @@ def _load_plugin_module(plugin_config, plugin_filter):
 def _load_microservice(plugin_config, plugin_filter):
     _mandatory_params = ("name", "module")
     if not all(k in plugin_config for k in _mandatory_params):
-        raise SATOSAConfigurationError("Missing mandatory plugin configuration parameter: {}".format(_mandatory_params))
+        raise SATOSAConfigurationError(
+            "Missing mandatory plugin configuration parameter: {}".format(_mandatory_params))
 
     return _load_plugin_module(plugin_config, plugin_filter)
 

src/satosa/proxy_server.py

@@ -99,7 +99,8 @@ def __call__(self, environ, start_response, debug=False):
         context.path = path
 
         # copy wsgi.input stream to allow it to be re-read later by satosa plugins
-        # see: http://stackoverflow.com/questions/1783383/how-do-i-copy-wsgi-input-if-i-want-to-process-post-data-more-than-once
+        # see: http://stackoverflow.com/
+        #      questions/1783383/how-do-i-copy-wsgi-input-if-i-want-to-process-post-data-more-than-once
         content_length = int(environ.get('CONTENT_LENGTH', '0') or '0')
         body = io.BytesIO(environ['wsgi.input'].read(content_length))
         environ['wsgi.input'] = body
@@ -115,9 +116,7 @@ def __call__(self, environ, start_response, debug=False):
                 raise resp
             return resp(environ, start_response)
         except SATOSANoBoundEndpointError:
-            resp = NotFound(
-                    "The Service or Identity Provider"
-                    "you requested could not be found.")
+            resp = NotFound("The Service or Identity Provider you requested could not be found.")
             return resp(environ, start_response)
         except Exception as err:
             if type(err) != UnknownSystemEntity:
@@ -142,7 +141,7 @@ def make_app(satosa_config):
             root_logger.setLevel(logging.DEBUG)
 
         try:
-            pkg = pkg_resources.get_distribution(module.__name__)
+            _ = pkg_resources.get_distribution(module.__name__)
             logger.info("Running SATOSA version %s",
                         pkg_resources.get_distribution("SATOSA").version)
         except (NameError, pkg_resources.DistributionNotFound):

src/satosa/response.py

@@ -112,4 +112,4 @@ class Unauthorized(Response):
     _status = "401 Unauthorized"
 
     def __init__(self, message, headers=None, content=None):
-        super().__init__(message, headers=headers, content=content)
+        super().__init__(message, headers=headers, content=content)