From 52e37726b09f4c390291b9533e3a84816d208702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Wed, 4 May 2022 11:47:32 +0200
Subject: [PATCH] Rely on importlib.resources traversable API. Fixes
DeprecationWarning.
---
jaraco/text/__init__.py | 6 +++---
setup.cfg | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jaraco/text/__init__.py b/jaraco/text/__init__.py
index 7540296..f038c74 100644
--- a/jaraco/text/__init__.py
+++ b/jaraco/text/__init__.py
@@ -8,9 +8,9 @@ import functools
import six
try:
- from importlib import resources
+ from importlib.resources import files # type: ignore
except ImportError: # pragma: nocover
- import importlib_resources as resources
+ from importlib_resources import files # type: ignore
from jaraco.functools import compose, method_cache
@@ -229,7 +229,7 @@ def unwrap(s):
return '\n'.join(cleaned)
-lorem_ipsum = resources.read_text(__name__, 'Lorem ipsum.txt')
+lorem_ipsum = str = files(__name__).joinpath('Lorem ipsum.txt').read_text()
class Splitter(object):
diff --git a/setup.cfg b/setup.cfg
index 16a996d..39303e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,7 @@ python_requires = >=2.7
install_requires =
jaraco.functools
six
- importlib_resources; python_version < "3.7"
+ importlib_resources; python_version < "3.9"
setup_requires = setuptools_scm >= 1.15.0
[options.extras_require]
--
2.33.1