diff --git a/README.ja.md b/README.ja.md index d3156e3..bf3c54d 100644 --- a/README.ja.md +++ b/README.ja.md @@ -199,8 +199,7 @@ API ドキュメントは [onlinejudge_template.generator package](https://onlin ### oj-prepare -`oj-prepare` の設定は (Linux の場合は) `~/.config/online-judge-tools/prepare.config.toml` で行えます。 -以下のように書いてください。 +`oj-prepare` の設定は (Linux の場合は) `~/.config/online-judge-tools/prepare.config.toml` で行えます。MacOS の場合は `/Users/{user_name}/Library/Application Support/online-judge-tools/prepare.config.toml` で行えます。以下のように書いてください。 ``` toml contest_directory = "~/Desktop/{service_domain}/{contest_id}/{problem_id}" diff --git a/README.md b/README.md index 67dc772..1485938 100644 --- a/README.md +++ b/README.md @@ -189,8 +189,11 @@ Also you can use certain directory (when you use Linux, it's `~/.config/online-j ### oj-prepare -There is the config file for `oj-prepare` at `~/.config/online-judge-tools/prepare.config.toml` (in Linux). -Please write as the following. +The config file for `oj-prepare` can be found at the following paths depending on your operating system: +`~/.config/online-judge-tools/prepare.config.toml` (Linux) +`/Users/{user_name}/Library/Application Support/online-judge-tools/prepare.config.toml` (MacOS) + +Please use the following format when editing the file: ``` toml contest_directory = "~/Desktop/{service_domain}/{contest_id}/{problem_id}" diff --git a/onlinejudge_template/generator/_main.py b/onlinejudge_template/generator/_main.py index 26be2f3..79f4699 100644 --- a/onlinejudge_template/generator/_main.py +++ b/onlinejudge_template/generator/_main.py @@ -1,3 +1,4 @@ +import importlib.resources import pathlib from logging import getLogger from typing import * @@ -5,7 +6,6 @@ import appdirs import mako.lookup import mako.template -import pkg_resources import onlinejudge_template.generator.hook as hook from onlinejudge_template.types import * @@ -16,7 +16,7 @@ def _get_template(template_file: str) -> mako.template.Template: directories = [ str(pathlib.Path(appdirs.user_config_dir('online-judge-tools')) / 'template'), - pkg_resources.resource_filename('onlinejudge_template_resources', 'template'), + importlib.resources.files('onlinejudge_template_resources') / 'template', ] lookup = mako.lookup.TemplateLookup(directories=directories, input_encoding="utf-8", output_encoding="utf-8") path = pathlib.Path(template_file)