diff options
Diffstat (limited to 'dev-python/pykwalify')
| -rw-r--r-- | dev-python/pykwalify/files/pykwalify-1.8.0-py315.patch | 36 | ||||
| -rw-r--r-- | dev-python/pykwalify/pykwalify-1.8.0-r4.ebuild (renamed from dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild) | 2 |
2 files changed, 38 insertions, 0 deletions
diff --git a/dev-python/pykwalify/files/pykwalify-1.8.0-py315.patch b/dev-python/pykwalify/files/pykwalify-1.8.0-py315.patch new file mode 100644 index 000000000000..e9abf2f3ff63 --- /dev/null +++ b/dev-python/pykwalify/files/pykwalify-1.8.0-py315.patch @@ -0,0 +1,36 @@ +From 31e32d0964fcff54c1b87944370ea669581795a2 Mon Sep 17 00:00:00 2001 +From: Joost van Griethuysen <joostjm@gmail.com> +Date: Tue, 28 Jan 2025 12:56:19 +0000 +Subject: [PATCH] BUG: Remove deprecated `load_module` + +In importlib's `SourceFileLoader`, the `load_module` function has been deprecated since python 3.6 and scheduled to be removed. +Following the suggestions from https://stackoverflow.com/questions/19009932/import-arbitrary-python-source-file-python-3-3, replace this function with the `exec_module` function. +--- + pykwalify/core.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/pykwalify/core.py b/pykwalify/core.py +index 140389c..8a14fe4 100644 +--- a/pykwalify/core.py ++++ b/pykwalify/core.py +@@ -13,6 +13,7 @@ + import time + from io import open + from importlib.machinery import SourceFileLoader ++import importlib.util + + # pyKwalify imports + import pykwalify +@@ -170,7 +171,11 @@ def _load_extensions(self): + if not os.path.exists(f): + raise CoreError(u"Extension file: {0} not found on disk".format(f)) + +- self.loaded_extensions.append(SourceFileLoader("", f).load_module()) ++ loader = SourceFileLoader("", f) ++ spec = importlib.util.spec_from_loader(loader.name, loader) ++ mod = importlib.util.module_from_spec(spec) ++ loader.exec_module(mod) ++ self.loaded_extensions.append(mod) + + log.debug(self.loaded_extensions) + log.debug([dir(m) for m in self.loaded_extensions]) diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r4.ebuild index 1c5a8b31a270..69f2366d551a 100644 --- a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild +++ b/dev-python/pykwalify/pykwalify-1.8.0-r4.ebuild @@ -36,4 +36,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch # fix tests for >=dev-python/ruamel-yaml-1.18, see #923136 "${FILESDIR}"/${PN}-1.8.0-ruamel-yaml-1.18.patch + # https://github.com/Grokzen/pykwalify/pull/203 + "${FILESDIR}"/${P}-py315.patch ) |