Changing module for fb_tools collections.

diff --git a/lib/pp_admintools/app/barracuda_sync.py b/lib/pp_admintools/app/barracuda_sync.py
index efc1c4a12073c6d58045355271499c237feb56e4..31fb1ac96dae1fb4dc75bf1ae07eee0d899946d8 100644 (file)
--- a/lib/pp_admintools/app/barracuda_sync.py
+++ b/lib/pp_admintools/app/barracuda_sync.py
@@ -18,7 +18,7 @@ from functools import cmp_to_key
 from pathlib import Path
 
 # Third party modules
-from fb_tools.collections import CIDict, CIStringSet
+from fb_tools.colcts import CIDict, CIStringSet
 from fb_tools.common import pp
 from fb_tools.handler import BaseHandler
 from fb_tools.multi_config import DEFAULT_ENCODING

diff --git a/lib/pp_admintools/app/check_ldap_dn_attributes.py b/lib/pp_admintools/app/check_ldap_dn_attributes.py
index cfb7a1c1c49bef8360b8063f9ef85d15589f2044..d31ba1979653ec4ef5ed0bebd9fc285fb48e1fc1 100644 (file)
--- a/lib/pp_admintools/app/check_ldap_dn_attributes.py
+++ b/lib/pp_admintools/app/check_ldap_dn_attributes.py
@@ -17,7 +17,7 @@ from functools import cmp_to_key
 # Third party modules
 
 # Own modules
-from fb_tools.collections import CIDict, CIStringSet
+from fb_tools.colcts import CIDict, CIStringSet
 from fb_tools.xlate import format_list
 
 from .ldap import BaseLdapApplication

diff --git a/lib/pp_admintools/app/check_ldap_pwd_schemes.py b/lib/pp_admintools/app/check_ldap_pwd_schemes.py
index 9f6070ba719a6e7ac09a1cd74b404ca450a73888..533a0674339e04cde9774b16197b4b3e5c6435ca 100644 (file)
--- a/lib/pp_admintools/app/check_ldap_pwd_schemes.py
+++ b/lib/pp_admintools/app/check_ldap_pwd_schemes.py
@@ -21,7 +21,7 @@ import logging
 # Third party modules
 
 # Own modules
-from fb_tools.collections import CIDict, CIStringSet
+from fb_tools.colcts import CIDict, CIStringSet
 from fb_tools.xlate import format_list
 
 from .ldap import BaseLdapApplication

diff --git a/lib/pp_admintools/app/clean_empty_ldap_groups.py b/lib/pp_admintools/app/clean_empty_ldap_groups.py
index f7dd43c64906cc286831acc389f65a777c64f7c9..45f8f7e57c47f5ee4f5dc145f43244aef46ad358 100644 (file)
--- a/lib/pp_admintools/app/clean_empty_ldap_groups.py
+++ b/lib/pp_admintools/app/clean_empty_ldap_groups.py
@@ -13,7 +13,7 @@ import copy
 import logging
 
 # Third party modules
-from fb_tools.collections import CIStringSet
+from fb_tools.colcts import CIStringSet
 # from fb_tools.common import is_sequence
 # from fb_tools.common import to_bool
 from fb_tools.xlate import format_list

diff --git a/lib/pp_admintools/app/ldap.py b/lib/pp_admintools/app/ldap.py
index 874e52b13a46ba586d50d1f15cefb3a2094d5ea6..b881121405c28b8938f89a4186dd61dd80176f06 100644 (file)
--- a/lib/pp_admintools/app/ldap.py
+++ b/lib/pp_admintools/app/ldap.py
@@ -23,7 +23,7 @@ from socket import gaierror
 
 # Third party modules
 from fb_tools.argparse_actions import TimeoutOptionAction
-from fb_tools.collections import CIDict, CIStringSet, FrozenCIStringSet
+from fb_tools.colcts import CIDict, CIStringSet, FrozenCIStringSet
 from fb_tools.common import is_sequence, to_bool
 from fb_tools.mailaddress import MailAddress
 

diff --git a/lib/pp_admintools/app/mirror_ldap.py b/lib/pp_admintools/app/mirror_ldap.py
index d104643c856167b7603c93d60f149c9942f7819e..0c7f4822aedf9c6567ee2263631af639fe48343e 100644 (file)
--- a/lib/pp_admintools/app/mirror_ldap.py
+++ b/lib/pp_admintools/app/mirror_ldap.py
@@ -18,8 +18,8 @@ from functools import cmp_to_key
 
 # Third party modules
 # from fb_tools.common import to_bool, is_sequence
-# from fb_tools.collections import FrozenCIStringSet, CIStringSet, CIDict
-from fb_tools.collections import CIDict, CIStringSet
+# from fb_tools.colcts import FrozenCIStringSet, CIStringSet, CIDict
+from fb_tools.colcts import CIDict, CIStringSet
 from fb_tools.xlate import format_list
 
 # from ldap3 import MODIFY_REPLACE, MODIFY_ADD, MODIFY_DELETE

diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py
index 95e33adb7bb233aa1d13f6b180c7deff85ec86d4..5cae58f9948d9b360961ceba94576dac7160b5c9 100644 (file)
--- a/lib/pp_admintools/app/remove_ldap_user.py
+++ b/lib/pp_admintools/app/remove_ldap_user.py
@@ -14,7 +14,7 @@ import logging
 import time
 
 # Third party modules
-from fb_tools.collections import CIStringSet
+from fb_tools.colcts import CIStringSet
 from fb_tools.common import is_sequence, to_bool
 from fb_tools.xlate import format_list
 

diff --git a/requirements.txt b/requirements.txt
index f04fc60b35e9d8318ab5765d0d4df275c020c298..7f2e5828a645ec34ba5e6fff49d48c94c30e30c4 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,5 +14,5 @@ hjson
 toml
 ldap3
 fb_logging
-fb_tools
+fb_tools=>2.6.0
 fb_pdnstools

diff --git a/template.spec b/template.spec
index 77c06e91195a65d8ce0ed96c10795ad650e4caa3..946f35b86acda483dc89ff80f530b7b22fa228a8 100644 (file)
--- a/template.spec
+++ b/template.spec
@@ -23,7 +23,7 @@ BuildRequires:  python@@@py_version_nodot@@@-babel
 BuildRequires:  python@@@py_version_nodot@@@-pytz
 BuildRequires:  python@@@py_version_nodot@@@-six
 BuildRequires:  python@@@py_version_nodot@@@-fb-logging
-BuildRequires:  python@@@py_version_nodot@@@-fb-tools >= 2.1.0
+BuildRequires:  python@@@py_version_nodot@@@-fb-tools >= 2.6.0
 BuildRequires:  python@@@py_version_nodot@@@-fb-pdnstools
 Requires:       python@@@py_version_nodot@@@
 Requires:       python@@@py_version_nodot@@@-libs
@@ -34,7 +34,7 @@ Requires:       python@@@py_version_nodot@@@-pytz
 Requires:       python@@@py_version_nodot@@@-requests
 Requires:       python@@@py_version_nodot@@@-six
 Requires:       python@@@py_version_nodot@@@-fb-logging
-Requires:       python@@@py_version_nodot@@@-fb-tools >= 2.1.0
+Requires:       python@@@py_version_nodot@@@-fb-tools >= 2.6.0
 Requires:       python@@@py_version_nodot@@@-fb-pdnstools
 Recommends:    python@@@py_version_nodot@@@-passlib
 BuildArch:      noarch