From cd36bad1a4b1fc82dc947309fbe5b3448e5ccaeb Mon Sep 17 00:00:00 2001 From: plotski Date: Sat, 2 Dec 2023 18:00:08 +0100 Subject: [PATCH 1/2] fix(deprecated): importlib.resources.read_text() is deprecated --- guessit/options.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/guessit/options.py b/guessit/options.py index 1e1ede1..d2498de 100644 --- a/guessit/options.py +++ b/guessit/options.py @@ -7,12 +7,24 @@ import copy import json import os import shlex +import sys from argparse import ArgumentParser -try: - from importlib.resources import read_text -except ImportError: - from importlib_resources import read_text +# importlib.resources.read_text() is deprecated since Python 3.11. +# importlib.resources.files() is new in Python 3.9. +if sys.version_info >= (3, 9, 0): + from importlib.resources import files + + def read_text(package, filename): + """ + Should behave like deprecated importlib.resources.read_text() + """ + return files(package).joinpath(filename).read_text() +else: + try: + from importlib.resources import read_text + except ImportError: + from importlib_resources import read_text def build_argument_parser(): From f62ec8ce7b364f89f79cdafa7935f3acd9266fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= Date: Wed, 13 Dec 2023 12:12:31 +0100 Subject: [PATCH 2/2] style: fix pylint false positive --- guessit/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guessit/options.py b/guessit/options.py index d2498de..521c9f3 100644 --- a/guessit/options.py +++ b/guessit/options.py @@ -19,7 +19,7 @@ if sys.version_info >= (3, 9, 0): """ Should behave like deprecated importlib.resources.read_text() """ - return files(package).joinpath(filename).read_text() + return files(package).joinpath(filename).read_text() # pylint:disable=unspecified-encoding else: try: from importlib.resources import read_text