jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-01-07 17:20:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace deprecated pkg_resources API

Browse source
This commit is contained in:
Jakob Ketterl 2023-09-18 22:04:28 +02:00
parent 4c2f9a67f6
commit 5f9b3d01bf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
owrx/controllers/assets.py
View file

@ -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)

4
owrx/controllers/template.py
View file

@ -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)