From da796c6e0183b5f76764af520e786a16d68736c6 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 6 Aug 2016 11:44:58 +0200
Subject: [PATCH] Corrects various errors spoted by travis and codacy

---
 cas_server/auth.py        |  3 ++-
 cas_server/tests/utils.py |  8 ++++++--
 cas_server/views.py       | 21 +++++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/cas_server/auth.py b/cas_server/auth.py
index 5f4913a..aa07593 100644
--- a/cas_server/auth.py
+++ b/cas_server/auth.py
@@ -372,7 +372,8 @@ class DjangoAuthUser(AuthUser):  # pragma: no cover
             # _meta.get_fields() is from the new documented _meta interface in django 1.8
             try:
                 field_names = [
-                    field.attname for field in self.user._meta.get_fields() if hasattr(field, "attname")
+                    field.attname for field in self.user._meta.get_fields()
+                    if hasattr(field, "attname")
                 ]
             # backward compatibility with django 1.7
             except AttributeError:  # pragma: no cover (only used by django 1.7)
diff --git a/cas_server/tests/utils.py b/cas_server/tests/utils.py
index bbab3cc..bee39cf 100644
--- a/cas_server/tests/utils.py
+++ b/cas_server/tests/utils.py
@@ -115,8 +115,8 @@ def get_validated_ticket(service):
 
     client = Client()
     response = client.get('/validate', {'ticket': ticket.value, 'service': service})
-    assert (response.status_code == 200)
-    assert (response.content == b'yes\ntest\n')
+    assert response.status_code == 200
+    assert response.content == b'yes\ntest\n'
 
     ticket = models.ServiceTicket.objects.get(value=ticket.value)
     return (auth_client, ticket)
@@ -222,6 +222,10 @@ class Http404Handler(HttpParamsHandler):
 
 class DummyCAS(BaseHTTPServer.BaseHTTPRequestHandler):
     """A dummy CAS that validate for only one (service, ticket) used in federated mode tests"""
+
+    #: dict of the last receive GET parameters
+    params = None
+
     def test_params(self):
         """check that internal and provided (service, ticket) matches"""
         if (
diff --git a/cas_server/views.py b/cas_server/views.py
index d7b78f0..f9be770 100644
--- a/cas_server/views.py
+++ b/cas_server/views.py
@@ -79,7 +79,13 @@ class LogoutMixin(object):
 
         # If all_session is set, search all of the user sessions
         if all_session:
-            users.extend(models.User.objects.filter(username=username))
+            users.extend(
+                models.User.objects.filter(
+                    username=username
+                ).exclude(
+                    session_key=self.request.session.session_key
+                )
+            )
 
         # Iterate over all user sessions that have to be logged out
         for user in users:
@@ -228,6 +234,9 @@ class FederateAuth(CsrfExemptView):
         csrf is disabled for allowing SLO requests reception.
     """
 
+    #: current URL used as service URL by the CAS client
+    service_url = None
+
     def get_cas_client(self, request, provider, renew=False):
         """
             return a CAS client object matching provider
@@ -291,7 +300,7 @@ class FederateAuth(CsrfExemptView):
         """
             method called on GET request
 
-            :param django.http.HttpRequest request: The current request object
+            :param django.http.HttpRequestself. request: The current request object
             :param unicode provider: Optional parameter. The user provider suffix.
         """
         # if settings.CAS_FEDERATE is not True redirect to the login page
@@ -1053,7 +1062,7 @@ class ValidationBaseError(Exception):
     def __init__(self, code, msg=""):
         self.code = code
         self.msg = msg
-        super(ValidateError, self).__init__(code)
+        super(ValidationBaseError, self).__init__(code)
 
     def __str__(self):
         return u"%s" % self.msg
@@ -1066,7 +1075,11 @@ class ValidationBaseError(Exception):
             :return: the rendered ``cas_server/serviceValidateError.xml`` template
             :rtype: django.http.HttpResponse
         """
-        return render(request, self.template, self.contex(), content_type="text/xml; charset=utf-8")
+        return render(
+            request,
+            self.template,
+            self.context(), content_type="text/xml; charset=utf-8"
+        )
 
 
 class ValidateError(ValidationBaseError):