Some adjustments for python 3.6

benadida · Apr 9, 2023 · b1eeb1b · b1eeb1b
1 parent 45f4069
commit b1eeb1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/helios_auth/auth_systems/ldapauth.py b/helios_auth/auth_systems/ldapauth.py
@@ -47,9 +47,9 @@ def ldap_login_view(request):
             password = form.cleaned_data['password'].strip()
 
             auth = backend.CustomLDAPBackend()
-            if user := auth.authenticate(
-                None, username=username, password=password
-            ):
+            user = auth.authenticate( None, username=username, password=password)
+
+            if user:
                 request.session['ldap_user'] = {
                     'username': user.username,
                     'email': user.email,

diff --git a/helios_auth/auth_systems/ldapbackend/backend.py b/helios_auth/auth_systems/ldapbackend/backend.py
@@ -24,7 +24,7 @@ def authenticate_ldap_user(self, username, password):
 
         if user and self.settings.BIND_PASSWORD == '' :
             search = self.settings.USER_SEARCH
-            if search is None:
+            if not isinstance(search, LDAPSearch):
                 raise ImproperlyConfigured('AUTH_LDAP_USER_SEARCH must be an LDAPSearch instance.')
             results = search.execute(user.ldap_user.connection, {'user': user.username})
             if results is not None and len(results) == 1:

diff --git a/requirements.txt b/requirements.txt
@@ -24,5 +24,5 @@ oauth2client==4.1.3
 rollbar==0.14.7
 
 #ldap auth
-django_auth_ldap==4.1.0
+django_auth_ldap==4.0.0
 python-ldap==3.4.3