Merge pull request #686 from IdentityPython/pylint-fixes

Fix pylint errors

Author: c00kiemon5ter

src/saml2/__init__.py

@@ -40,8 +40,7 @@
 import defusedxml.ElementTree
 
 
-root_logger = logging.getLogger(__name__)
-root_logger.level = logging.NOTSET
+logger = logging.getLogger(__name__)
 
 NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:assertion'
 # TEMPLATE = '{urn:oasis:names:tc:SAML:2.0:assertion}%s'

src/saml2/authn.py

@@ -29,13 +29,13 @@ def __init__(self, srv):
         self.srv = srv
 
     def __call__(self, *args, **kwargs):
-        raise NotImplemented
+        raise NotImplementedError
 
     def authenticated_as(self, **kwargs):
-        raise NotImplemented
+        raise NotImplementedError
 
     def verify(self, **kwargs):
-        raise NotImplemented
+        raise NotImplementedError
 
 
 def is_equal(a, b):

src/saml2/client.py

@@ -222,7 +222,7 @@ def do_logout(self, name_id, entity_ids, reason, expire, sign=None,
                     sign = True
 
                 if sign is None:
-                    sign = self.logout_requests_signed
+                    sign = self.config.logout_requests_signed
 
                 sigalg = None
                 if sign:

src/saml2/config.py

@@ -10,18 +10,20 @@
 
 import six
 
-from saml2 import root_logger, BINDING_URI, SAMLError
-from saml2 import BINDING_SOAP
-from saml2 import BINDING_HTTP_REDIRECT
-from saml2 import BINDING_HTTP_POST
 from saml2 import BINDING_HTTP_ARTIFACT
+from saml2 import BINDING_HTTP_POST
+from saml2 import BINDING_HTTP_REDIRECT
+from saml2 import BINDING_SOAP
+from saml2 import BINDING_URI
+from saml2 import SAMLError
 
 from saml2.attribute_converter import ac_factory
 from saml2.assertion import Policy
 from saml2.mdstore import MetadataStore
 from saml2.saml import NAME_FORMAT_URI
 from saml2.virtual_org import VirtualOrg
 
+
 logger = logging.getLogger(__name__)
 
 __author__ = 'rolandh'
@@ -47,7 +49,6 @@
     "contact_person",
     "name_form",
     "virtual_organization",
-    "logger",
     "only_use_keys_in_metadata",
     "disable_ssl_certificate_validation",
     "preferred_binding",
@@ -211,7 +212,6 @@ def __init__(self, homedir="."):
         self.name_id_format = None
         self.name_id_format_allow_create = None
         self.virtual_organization = None
-        self.logger = None
         self.only_use_keys_in_metadata = True
         self.logout_requests_signed = None
         self.disable_ssl_certificate_validation = None
@@ -453,63 +453,6 @@ def endpoint(self, service, binding=None, context=None):
         else:
             return unspec
 
-    def log_handler(self):
-        try:
-            _logconf = self.logger
-        except KeyError:
-            return None
-
-        handler = None
-        for htyp in LOG_HANDLER:
-            if htyp in _logconf:
-                if htyp == "syslog":
-                    args = _logconf[htyp]
-                    if "socktype" in args:
-                        import socket
-                        if args["socktype"] == "dgram":
-                            args["socktype"] = socket.SOCK_DGRAM
-                        elif args["socktype"] == "stream":
-                            args["socktype"] = socket.SOCK_STREAM
-                        else:
-                            raise ConfigurationError("Unknown socktype!")
-                    try:
-                        handler = LOG_HANDLER[htyp](**args)
-                    except TypeError:  # difference between 2.6 and 2.7
-                        del args["socktype"]
-                        handler = LOG_HANDLER[htyp](**args)
-                else:
-                    handler = LOG_HANDLER[htyp](**_logconf[htyp])
-                break
-
-        if handler is None:
-            # default if rotating logger
-            handler = LOG_HANDLER["rotating"]()
-
-        if "format" in _logconf:
-            formatter = logging.Formatter(_logconf["format"])
-        else:
-            formatter = logging.Formatter(LOG_FORMAT)
-
-        handler.setFormatter(formatter)
-        return handler
-
-    def setup_logger(self):
-        if root_logger.level != logging.NOTSET:  # Someone got there before me
-            return root_logger
-
-        _logconf = self.logger
-        if _logconf is None:
-            return root_logger
-
-        try:
-            root_logger.setLevel(LOG_LEVEL[_logconf["loglevel"].lower()])
-        except KeyError:  # reasonable default
-            root_logger.setLevel(logging.INFO)
-
-        root_logger.addHandler(self.log_handler())
-        root_logger.info("Logging started")
-        return root_logger
-
     def endpoint2service(self, endpoint, context=None):
         endps = self.getattr("endpoints", context)
 

src/saml2/cryptography/symmetric.py

@@ -89,7 +89,7 @@ def build_cipher(self, *args, **kwargs):
             "The 'Fernet' class does not need a build_cipher method."
             "Remove any calls to this method. "
             "In the next version, this method will be removed."
-        ).format(name=cls.__name__, type=type(cls).__name__)
+        )
         _warnings.warn(_deprecation_msg, DeprecationWarning)
 
 

src/saml2/entity.py

@@ -159,7 +159,6 @@ def __init__(self, entity_type, config=None, config_file="",
                 vo.sp = self
 
         self.metadata = self.config.metadata
-        self.config.setup_logger()
         self.debug = self.config.debug
 
         self.sec = security_context(self.config)

src/saml2/httpbase.py

@@ -84,9 +84,10 @@ def _since_epoch(cdate):
             break
 
     if t == -1:
-        raise (Exception,
-               'ValueError: Date "{0}" does not match any of: {1}'.format(
-                   cdate,TIME_FORMAT))
+        err = 'ValueError: Date "{0}" does not match any of: {1}'.format(
+            cdate, TIME_FORMAT
+        )
+        raise Exception(err)
 
     return calendar.timegm(t)
 
@@ -328,7 +329,7 @@ def use_http_uri(message, typ, destination="", relay_state=""):
                 "url": "%s?%s" % (destination, query)
             }
         else:
-            raise NotImplemented
+            raise NotImplementedError
 
         return info
 

src/saml2/ident.py

@@ -140,7 +140,7 @@ def remove_remote(self, name_id):
         del self.db[name_id.text]
 
     def remove_local(self, sid):
-        if isinstance(sid, unicode):
+        if not isinstance(sid, bytes):
             sid = sid.encode("utf-8")
 
         try:

src/saml2/mongo_store.py

@@ -321,7 +321,7 @@ def __getitem__(self, key):
             raise CorruptDatabase("Found more than one EPTID document")
 
     def __setitem__(self, key, value):
-        _ = self.mdb.store(key, **{"eptid": value})
+        self.mdb.store(key, **{"eptid": value})
 
 
 #------------------------------------------------------------------------------

src/saml2/s2repoze/plugins/formswithhidden.py

@@ -1,4 +1,4 @@
-import urllib
+from six.moves.urllib.parse import urlencode
 
 from paste.httpheaders import CONTENT_LENGTH
 from paste.httpheaders import CONTENT_TYPE
@@ -71,7 +71,7 @@ def identify(self, environ):
                 return None
             del query[self.login_form_qs]
             query.update(qinfo)
-            environ["QUERY_STRING"] = urllib.urlencode(query)
+            environ["QUERY_STRING"] = urlencode(query)
             environ["repoze.who.application"] = HTTPFound(construct_url(environ))
             credentials = {"login": login, "password": password}
             max_age = form.get("max_age", None)