From ccda65129886c0d6cd4739f4c8b1169e8a659a96 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 17 Apr 2020 18:28:48 +0200 Subject: [PATCH] Fix imports --- test/conftest.py | 2 +- test/src/ldap_server.py | 4 ++-- test/src/old_slapdtest/_slapdtest.py | 2 +- tox.ini | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 3d1079fe..938ee2d1 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -7,7 +7,7 @@ import os import shutil import pytest -from src.ldap_server import LDAPServer +from .src.ldap_server import LDAPServer def patch_init(moulinette): diff --git a/test/src/ldap_server.py b/test/src/ldap_server.py index 710f04a6..0443ee64 100644 --- a/test/src/ldap_server.py +++ b/test/src/ldap_server.py @@ -1,7 +1,7 @@ try: - import slapdtest + from . import slapdtest except ImportError: - import old_slapdtest as slapdtest + from . import old_slapdtest as slapdtest import os from moulinette.authenticators import ldap as m_ldap diff --git a/test/src/old_slapdtest/_slapdtest.py b/test/src/old_slapdtest/_slapdtest.py index ab40ff55..389891c9 100644 --- a/test/src/old_slapdtest/_slapdtest.py +++ b/test/src/old_slapdtest/_slapdtest.py @@ -21,7 +21,7 @@ import unittest os.environ["LDAPNOINIT"] = "1" import ldap -from urllib import quote_plus +from urllib.parse import quote_plus try: from shutil import which diff --git a/tox.ini b/tox.ini index 0f996409..e5681b8f 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ deps = pytest-cov >= 2.7.1, < 3.0 pytest-mock >= 1.10.4, < 2.0 pytest-env >= 0.6.2, < 1.0 + python-ldap requests >= 2.22.0, < 3.0 requests-mock >= 1.6.0, < 2.0 toml >= 0.10, < 0.11