Linter fixes

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

setup.cfg

@@ -87,6 +87,7 @@ markers =
 
 
 [flake8]
+max-line-length = 120
 author-attribute = forbidden
 no-accept-encodings = True
 assertive-snakecase = True

src/saml2/attribute_converter.py

@@ -11,7 +11,7 @@
 from saml2 import saml, ExtensionElement, NAMESPACE
 from saml2 import extension_elements_to_elements
 from saml2 import SAMLError
-from saml2.saml import NAME_FORMAT_UNSPECIFIED, NAMEID_FORMAT_PERSISTENT, NameID
+from saml2.saml import NAME_FORMAT_UNSPECIFIED, NAMEID_FORMAT_PERSISTENT
 
 import logging
 logger = logging.getLogger(__name__)
@@ -136,12 +136,13 @@ def list_to_local(acs, attrlist, allow_unknown_attributes=False):
         try:
             _func = acsd[attr.name_format].ava_from
         except KeyError:
-            if attr.name_format == NAME_FORMAT_UNSPECIFIED or \
-                    allow_unknown_attributes:
+            if (
+                attr.name_format == NAME_FORMAT_UNSPECIFIED
+                or allow_unknown_attributes
+            ):
                 _func = acs[0].lcd_ava_from
             else:
-                logger.info("Unsupported attribute name format: %s",
-                    attr.name_format)
+                logger.info("Unsupported attribute name format: %s", attr.name_format)
                 continue
 
         try:
@@ -384,7 +385,7 @@ def to_format(self, attr):
         except KeyError:
             try:
                 _attr = self._to[attr.lower()]
-            except:
+            except KeyError:
                 _attr = ''
 
         if _attr:

src/saml2/attribute_resolver.py

@@ -10,15 +10,15 @@
 #from saml2 import client
 from saml2 import BINDING_SOAP
 
+
 logger = logging.getLogger(__name__)
 
 DEFAULT_BINDING = BINDING_SOAP
 
-class AttributeResolver(object):
 
+class AttributeResolver(object):
     def __init__(self, saml2client, metadata=None, config=None):
         self.metadata = metadata
-
         self.saml2client = saml2client
         self.metadata = saml2client.config.metadata
 
@@ -42,8 +42,8 @@ def extend(self, name_id, issuer, vo_members):
                         continue
                     # attribute query assumes SOAP binding
                     session_info = self.saml2client.attribute_query(
-                        name_id, attr_serv.location, issuer_id=issuer,
-)
+                        name_id, attr_serv.location, issuer_id=issuer
+                    )
                     if session_info:
                         result.append(session_info)
         return result

src/saml2/authn.py

@@ -159,7 +159,7 @@ def verify(self, request, **kwargs):
             wants the user after authentication.
         """
 
-        #logger.debug("verify(%s)" % request)
+        # logger.debug("verify(%s)" % request)
         if isinstance(request, six.string_types):
             _dict = parse_qs(request)
         elif isinstance(request, dict):
@@ -236,6 +236,7 @@ def __call__(self, **kwargs):
 try:
     import ldap
 
+
     class LDAPAuthn(UsernamePasswordMako):
         def __init__(self, srv, ldapsrv, return_to,
                      dn_pattern, mako_template, template_lookup):

src/saml2/client.py

@@ -6,7 +6,6 @@
 """Contains classes and functions that a SAML2.0 Service Provider (SP) may use
 to conclude its tasks.
 """
-from saml2.request import LogoutRequest
 import saml2
 
 from saml2 import saml, SAMLError
@@ -140,7 +139,7 @@ def prepare_for_negotiated_authenticate(
         for binding in bindings_to_try:
             try:
                 destination = self._sso_location(entityid, binding)
-            except Exception as e:
+            except Exception:
                 unsupported_bindings.append(binding)
             else:
                 binding_destinations.append((binding, destination))

src/saml2/client_base.py

@@ -630,7 +630,7 @@ def create_authz_decision_query_using_assertion(
         consent=None,
         extensions=None,
         sign=None,
-        sign_ag=None,
+        sign_alg=None,
         digest_alg=None,
         nsprefix=None,
     ):

src/saml2/config.py

@@ -8,8 +8,6 @@
 from logging.config import dictConfig as configure_logging_by_dict
 from warnings import warn as _warn
 
-import six
-
 from saml2 import BINDING_HTTP_ARTIFACT
 from saml2 import BINDING_HTTP_POST
 from saml2 import BINDING_HTTP_REDIRECT
@@ -375,15 +373,16 @@ def load_metadata(self, metadata_conf):
 
         try:
             ca_certs = self.ca_certs
-        except:
+        except Exception:
             ca_certs = None
         try:
             disable_validation = self.disable_ssl_certificate_validation
-        except:
+        except Exception:
             disable_validation = False
 
-        mds = MetadataStore(acs, self, ca_certs,
-            disable_ssl_certificate_validation=disable_validation)
+        mds = MetadataStore(
+            acs, self, ca_certs, disable_ssl_certificate_validation=disable_validation
+        )
 
         mds.imp(metadata_conf)