[PR #9992/8525e420 backport][stable-9] Avoid deprecated AnsibleFilterTypeError (#9993)

Avoid deprecated AnsibleFilterTypeError (#9992)

Avoid deprecated AnsibleFilterTypeError.

(cherry picked from commit 8525e420bc)

Co-authored-by: Felix Fontein <felix@fontein.de>

changelogs/fragments/9992-filtertypeerror.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "hashids and unicode_normalize filter plugins - avoid deprecated ``AnsibleFilterTypeError`` on ansible-core 2.19 (https://github.com/ansible-collections/community.general/pull/9992)."

plugins/filter/hashids.py

@@ -10,12 +10,16 @@ __metaclass__ = type
 from ansible.errors import (
     AnsibleError,
     AnsibleFilterError,
-    AnsibleFilterTypeError,
 )
 
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.common.collections import is_sequence
 
+try:
+    from ansible.errors import AnsibleTypeError
+except ImportError:
+    from ansible.errors import AnsibleFilterTypeError as AnsibleTypeError
+
 try:
     from hashids import Hashids
     HAS_HASHIDS = True
@@ -64,7 +68,7 @@ def hashids_encode(nums, salt=None, alphabet=None, min_length=None):
     try:
         hashid = hashids.encode(*nums)
     except TypeError as e:
-        raise AnsibleFilterTypeError(
+        raise AnsibleTypeError(
             "Data to encode must by a tuple or list of ints: %s" % to_native(e)
         )
 

plugins/filter/unicode_normalize.py

@@ -49,9 +49,14 @@ RETURN = '''
 
 from unicodedata import normalize
 
-from ansible.errors import AnsibleFilterError, AnsibleFilterTypeError
+from ansible.errors import AnsibleFilterError
 from ansible.module_utils.six import text_type
 
+try:
+    from ansible.errors import AnsibleTypeError
+except ImportError:
+    from ansible.errors import AnsibleFilterTypeError as AnsibleTypeError
+
 
 def unicode_normalize(data, form='NFC'):
     """Applies normalization to 'unicode' strings.
@@ -66,7 +71,7 @@ def unicode_normalize(data, form='NFC'):
     """
 
     if not isinstance(data, text_type):
-        raise AnsibleFilterTypeError("%s is not a valid input type" % type(data))
+        raise AnsibleTypeError("%s is not a valid input type" % type(data))
 
     if form not in ('NFC', 'NFD', 'NFKC', 'NFKD'):
         raise AnsibleFilterError("%s is not a valid form" % form)