Use helper functions for Python 3.11 and later.

Author: domdfcoding

domdf_python_tools/compat/importlib_resources.py

@@ -1,34 +1,60 @@
-# noqa: D100
+# noqa: D100,DALL000
 
 # stdlib
+import os
 import sys
-from typing import TextIO
+from typing import Any, BinaryIO, TextIO
 
 if sys.version_info[:2] < (3, 7):  # pragma: no cover (py37+)
 	# 3rd party
 	import importlib_resources
-	from importlib_resources._common import normalize_path
 
 	globals().update(importlib_resources.__dict__)
 
+else:  # pragma: no cover (<py39)
+	# stdlib
+	import importlib.resources
+	globals().update(importlib.resources.__dict__)
+
+if not ((3, 7) <= sys.version_info < (3, 11)):  # pragma: no cover (py37 OR py38 OR py39 OR py310):
+
+	def _normalize_path(path: Any) -> str:
+		"""
+		Normalize a path by ensuring it is a string.
+
+		If the resulting string contains path separators, an exception is raised.
+		"""
+
+		parent, file_name = os.path.split(str(path))
+		if parent:
+			raise ValueError(f'{path!r} must be only a file name')
+		return file_name
+
+	def open_binary(package: importlib_resources.Package, resource: importlib_resources.Resource) -> BinaryIO:
+		"""
+		Return a file-like object opened for binary reading of the resource.
+		"""
+
+		return (importlib_resources.files(package) / _normalize_path(resource)).open("rb")
+
 	def read_binary(package: importlib_resources.Package, resource: importlib_resources.Resource) -> bytes:
 		"""
 		Return the binary contents of the resource.
 		"""
 
-		return (importlib_resources.files(package) / normalize_path(resource)).read_bytes()
+		return (importlib_resources.files(package) / _normalize_path(resource)).read_bytes()
 
 	def open_text(
 			package: importlib_resources.Package,
 			resource: importlib_resources.Resource,
-			encoding: str = 'utf-8',
-			errors: str = 'strict',
+			encoding: str = "utf-8",
+			errors: str = "strict",
 			) -> TextIO:
 		"""
 		Return a file-like object opened for text reading of the resource.
 		"""
 
-		return (importlib_resources.files(package) / normalize_path(resource)).open(
+		return (importlib_resources.files(package) / _normalize_path(resource)).open(
 				'r',
 				encoding=encoding,
 				errors=errors,
@@ -37,17 +63,12 @@ def open_text(
 	def read_text(
 			package: importlib_resources.Package,
 			resource: importlib_resources.Resource,
-			encoding: str = 'utf-8',
-			errors: str = 'strict',
+			encoding: str = "utf-8",
+			errors: str = "strict",
 			) -> str:
 		"""
 		Return the decoded string of the resource.
 		"""
 
-		with importlib_resources.open_text(package, resource, encoding, errors) as fp:
+		with open_text(package, resource, encoding, errors) as fp:
 			return fp.read()
-
-else:  # pragma: no cover (<py39)
-	# stdlib
-	import importlib.resources
-	globals().update(importlib.resources.__dict__)