From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 16 Jul 2024 15:10:07 +0000 (+0200)
Subject: Changing module for fb_tools collections.
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=495e2770e3001c65e2526951f0bf4093df48a3eb;p=pixelpark%2Fpp-admin-tools.git

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 efc1c4a..31fb1ac 100644
--- 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 cfb7a1c..d31ba19 100644
--- 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 9f6070b..533a067 100644
--- 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 f7dd43c..45f8f7e 100644
--- 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 874e52b..b881121 100644
--- 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 d104643..0c7f482 100644
--- 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 95e33ad..5cae58f 100644
--- 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 f04fc60..7f2e582 100644
--- 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 77c06e9..946f35b 100644
--- 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