diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py index d9a273fa..870e1164 100644 --- a/owrx/controllers/assets.py +++ b/owrx/controllers/assets.py @@ -3,7 +3,7 @@ from owrx.config.core import CoreConfig from datetime import datetime, timezone import mimetypes import os -import pkg_resources +from importlib import resources from abc import ABCMeta, abstractmethod import gzip @@ -100,7 +100,7 @@ class OwrxAssetsController(AssetsController): user_file = "{}/{}.{}".format(config.get_data_directory(), mappedFiles[file], ext) if os.path.exists(user_file) and os.path.isfile(user_file): return user_file - return pkg_resources.resource_filename("htdocs", file) + return resources.files("htdocs").joinpath(file) class AprsSymbolsController(AssetsController): @@ -171,7 +171,7 @@ class CompiledAssetsController(GzipMixin, ModificationAwareController): return files = CompiledAssetsController.profiles[profileName] - files = [pkg_resources.resource_filename("htdocs", f) for f in files] + files = [resources.files("htdocs").joinpath(f) for f in files] modified = self.getModified(files) diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py index f7e1a530..d46ef0f7 100644 --- a/owrx/controllers/template.py +++ b/owrx/controllers/template.py @@ -1,12 +1,12 @@ from owrx.controllers import Controller from owrx.details import ReceiverDetails from string import Template -import pkg_resources +from importlib import resources class TemplateController(Controller): def render_template(self, file, **vars): - file_content = pkg_resources.resource_string("htdocs", file).decode("utf-8") + file_content = resources.files("htdocs").joinpath(file).read_bytes().decode("utf-8") template = Template(file_content) return template.safe_substitute(**vars)