diff --git a/maloja/server.py b/maloja/server.py index 9090630..c76d9a9 100644 --- a/maloja/server.py +++ b/maloja/server.py @@ -165,16 +165,16 @@ def login(): @webserver.route("/media/.") def static(name,ext): assert ext in ["txt","ico","jpeg","jpg","png","less","js","ttf","css"] - with resources.files('maloja') / 'web' / 'static' as staticfolder: - response = static_file(ext + "/" + name + "." + ext,root=staticfolder) + staticfolder = resources.files('maloja') / 'web' / 'static' + response = static_file(ext + "/" + name + "." + ext,root=staticfolder) response.set_header("Cache-Control", "public, max-age=3600") return response # new, direct reference @webserver.route("/static/") def static(path): - with resources.files('maloja') / 'web' / 'static' as staticfolder: - response = static_file(path,root=staticfolder) + staticfolder = resources.files('maloja') / 'web' / 'static' + response = static_file(path,root=staticfolder) response.set_header("Cache-Control", "public, max-age=3600") return response diff --git a/maloja/setup.py b/maloja/setup.py index 9f9ba60..6eb88cc 100644 --- a/maloja/setup.py +++ b/maloja/setup.py @@ -1,10 +1,7 @@ import os +import shutil from importlib import resources -try: - from setuptools import distutils -except ImportError: - import distutils from doreah.io import col, ask, prompt from .pkg_global.conf import data_dir, dir_settings, malojaconfig, auth @@ -22,15 +19,14 @@ ext_apikeys = [ def copy_initial_local_files(): - with resources.files("maloja") / 'data_files' as folder: - for cat in dir_settings: - if dir_settings[cat] is None: - continue + data_file_source = resources.files("maloja") / 'data_files' + for cat in dir_settings: + if dir_settings[cat] is None: + continue + if cat == 'config' and malojaconfig.readonly: + continue - if cat == 'config' and malojaconfig.readonly: - continue - - distutils.dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False) + shutil.copytree(data_file_source / cat, dir_settings[cat]) charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ") def randomstring(length=32): diff --git a/pyproject.toml b/pyproject.toml index 1b6bb99..4196c8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,6 @@ dependencies = [ "sqlalchemy==2.0", "python-datauri==3.0.*", "requests==2.32.*", - "setuptools==75.8.*", "toml==0.10.*", "PyYAML==6.0.*" ]