Rely on ExceptionTrap.passes for testing decodable.

jaraco · Oct 31, 2021 · 139ef36 · 139ef36
1 parent 3a82a4d
commit 139ef36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/jaraco/text/__init__.py b/jaraco/text/__init__.py
@@ -8,8 +8,8 @@
 except ImportError:  # pragma: nocover
     from importlib_resources import files  # type: ignore
 
-from jaraco.functools import compose, method_cache, apply
-from jaraco.context import suppress
+from jaraco.functools import compose, method_cache
+from jaraco.context import ExceptionTrap
 
 
 def substitution(old, new):
@@ -129,8 +129,11 @@ def split(self, splitter=' ', maxsplit=0):
         return pattern.split(self, maxsplit)
 
 
-@apply(bool)
-@suppress(UnicodeDecodeError)
+# Python 3.8 compatibility
+_unicode_trap = ExceptionTrap(UnicodeDecodeError)
+
+
+@_unicode_trap.passes
 def is_decodable(value):
     r"""
     Return True if the supplied value is decodable (using the default
@@ -142,7 +145,6 @@ def is_decodable(value):
     True
     """
     value.decode()
-    return True
 
 
 def is_binary(value):

diff --git a/setup.cfg b/setup.cfg
@@ -18,7 +18,7 @@ include_package_data = true
 python_requires = >=3.6
 install_requires =
 	jaraco.functools
-	jaraco.context
+	jaraco.context >= 4.1
 	importlib_resources; python_version < "3.9"
 
 [options.packages.find]