diff --git a/.gitignore b/.gitignore index 1e37f87..6989ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ docs/_build *.sqlite3 .coverage *.egg-info +.venv diff --git a/django_python3_ldap/ldap.py b/django_python3_ldap/ldap.py index 3f7c3c2..a8e95b9 100644 --- a/django_python3_ldap/ldap.py +++ b/django_python3_ldap/ldap.py @@ -1,7 +1,6 @@ """ Low-level LDAP hooks. """ -import ssl import ldap3 from ldap3.core.exceptions import LDAPException @@ -148,7 +147,7 @@ def get_tls_options(settings): return None if settings.LDAP_AUTH_TLS_VALIDATE_CERT: - tls_options['validate'] = settings.LDAP_AUTH_TLS_VALIDATE_CERT + tls_options['validate'] = settings.LDAP_AUTH_TLS_VALIDATE_CERT if settings.LDAP_AUTH_TLS_CA_CERTS_FILE: tls_options['ca_certs_file'] = settings.LDAP_AUTH_TLS_CA_CERTS_FILE @@ -162,7 +161,6 @@ def get_tls_options(settings): return (ldap3.Tls(**tls_options)) - @contextmanager def connection(**kwargs): """ diff --git a/django_python3_ldap/tests.py b/django_python3_ldap/tests.py index 13da4d4..57dbe56 100644 --- a/django_python3_ldap/tests.py +++ b/django_python3_ldap/tests.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import ssl -from unittest import skipUnless, skip +from unittest import skipUnless from io import StringIO from django.test import TestCase, override_settings @@ -117,7 +117,6 @@ def testRepeatedUserAuthenticationDoestRecreateUsers(self): # Ensure that the user isn't recreated on second access. self.assertEqual(user_1.pk, user_2.pk) - def testAuthenticateWithRebind(self): with self.settings( LDAP_AUTH_CONNECTION_USERNAME=settings.LDAP_AUTH_TEST_USER_USERNAME, @@ -418,8 +417,8 @@ def setUp(self): def testSyncUsersCreatesUsers(self): with self.settings( - LDAP_AUTH_ATTRIBUTES=['givenName', "homeDirectory", "uid"], - LDAP_AUTH_USER_FIELDS={ + LDAP_AUTH_ATTRIBUTES=['givenName', "homeDirectory", "uid"], + LDAP_AUTH_USER_FIELDS={ "username": "uid", "first_name": "givenName", "last_name": "homeDirectory", @@ -436,7 +435,6 @@ def testSyncUsersCreatesUsers(self): self.assertEqual(user.email, '') - @skipUnless(settings.LDAP_AUTH_TEST_USER_USERNAME, "No settings.LDAP_AUTH_TEST_USER_USERNAME supplied.") @skipUnless(settings.LDAP_AUTH_TEST_USER_PASSWORD, "No settings.LDAP_AUTH_TEST_USER_PASSWORD supplied.") @skipUnless(settings.LDAP_AUTH_USER_LOOKUP_FIELDS == ("username",), "Cannot test using custom lookup fields.")