refactor: use higher level get_app_path

It's just nicer to read; less mental load.
This commit is contained in:
barredterra 2023-08-21 17:15:45 +02:00
parent 8cfee4dfe2
commit 41b0308951
4 changed files with 10 additions and 11 deletions

View file

@ -100,8 +100,7 @@ def get_patches_from_app(app: str, patch_type: PatchType | None = None) -> list[
1. ini like file with section for different patch_type
2. plain text file with each line representing a patch.
"""
patches_file = frappe.get_pymodule_path(app, "patches.txt")
patches_file = frappe.get_app_path(app, "patches.txt")
try:
return parse_as_configfile(patches_file, patch_type)

View file

@ -97,7 +97,7 @@ class ParallelTestRunner:
make_test_records(doctype, commit=True)
def get_module(self, path, filename):
app_path = frappe.get_pymodule_path(self.app)
app_path = frappe.get_app_path(self.app)
relative_path = os.path.relpath(path, app_path)
if relative_path == ".":
module_name = self.app
@ -217,7 +217,7 @@ class ParallelTestResult(unittest.TextTestResult):
def get_all_tests(app):
test_file_list = []
for path, folders, files in os.walk(frappe.get_pymodule_path(app)):
for path, folders, files in os.walk(frappe.get_app_path(app)):
for dontwalk in ("locals", ".git", "public", "__pycache__"):
if dontwalk in folders:
folders.remove(dontwalk)

View file

@ -157,7 +157,7 @@ def run_all_tests(app=None, verbose=False, profile=False, failfast=False, junit_
test_suite = unittest.TestSuite()
for app in apps:
for path, folders, files in os.walk(frappe.get_pymodule_path(app)):
for path, folders, files in os.walk(frappe.get_app_path(app)):
for dontwalk in ("locals", ".git", "public", "__pycache__"):
if dontwalk in folders:
folders.remove(dontwalk)
@ -312,7 +312,7 @@ def _add_test(app, path, filename, verbose, test_suite=None):
# in /doctype/doctype/boilerplate/
return
app_path = frappe.get_pymodule_path(app)
app_path = frappe.get_app_path(app)
relative_path = os.path.relpath(path, app_path)
if relative_path == ".":
module_name = app

View file

@ -306,7 +306,7 @@ def get_translations_from_apps(lang, apps=None):
translations = {}
for app in apps or frappe.get_installed_apps(_ensure_on_bench=True):
path = os.path.join(frappe.get_pymodule_path(app), "translations", lang + ".csv")
path = frappe.get_app_path(app, "translations", lang + ".csv")
translations.update(get_translation_dict_from_file(path, lang, app) or {})
if "-" in lang:
parent = lang.split("-", 1)[0]
@ -639,7 +639,7 @@ def get_server_messages(app):
inside an app"""
messages = []
file_extensions = (".py", ".html", ".js", ".vue")
app_walk = os.walk(frappe.get_pymodule_path(app))
app_walk = os.walk(frappe.get_app_path(app))
for basepath, folders, files in app_walk:
folders[:] = [folder for folder in folders if folder not in {".git", "__pycache__"}]
@ -1128,8 +1128,8 @@ def migrate_translations(source_app, target_app):
languages = frappe.translate.get_all_languages()
source_app_translations_dir = os.path.join(frappe.get_pymodule_path(source_app), "translations")
target_app_translations_dir = os.path.join(frappe.get_pymodule_path(target_app), "translations")
source_app_translations_dir = frappe.get_app_path(source_app, "translations")
target_app_translations_dir = frappe.get_app_path(target_app, "translations")
if not os.path.exists(target_app_translations_dir):
os.makedirs(target_app_translations_dir)
@ -1181,7 +1181,7 @@ def write_translations_file(app, lang, full_dict=None, app_messages=None):
if not app_messages:
return
tpath = frappe.get_pymodule_path(app, "translations")
tpath = frappe.get_app_path(app, "translations")
frappe.create_folder(tpath)
write_csv_file(
os.path.join(tpath, lang + ".csv"), app_messages, full_dict or get_all_translations(lang)