From 4959dd02f1c8d7cac0ed677eed43ed0bc454a2a5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 14 Jul 2021 20:14:37 +0530
Subject: [PATCH] refactor(minor): frappe.translate.get_messages_from_file

* Don't re-define frappe util - get_bench_path
* Add Python types
* Style changes
---
 frappe/commands/utils.py |  2 +-
 frappe/translate.py      | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index 874ec90d47..8fc6877d4f 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -770,7 +770,7 @@ def get_version(output):
 		"table": lambda: render_table(
 			[["App", "Version", "Branch", "Commit"]] +
 			[
-				[app_info.app, app_info.version, app_info.branch, app_info.commit] 
+				[app_info.app, app_info.version, app_info.branch, app_info.commit]
 				for app_info in data
 			]
 		),
diff --git a/frappe/translate.py b/frappe/translate.py
index 15d771ecdd..ce4c3abf3d 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -15,11 +15,11 @@ import functools
 import os
 import re
 from csv import reader
-from typing import List, Union
+from typing import List, Union, Tuple
 
 import frappe
 from frappe.model.utils import InvalidIncludePath, render_include
-from frappe.utils import is_html, strip, strip_html_tags
+from frappe.utils import get_bench_path, is_html, strip, strip_html_tags
 
 
 def get_language(lang_list: List = None) -> str:
@@ -558,7 +558,7 @@ def get_all_messages_from_js_files(app_name=None):
 
 	return messages
 
-def get_messages_from_file(path):
+def get_messages_from_file(path: str) -> List[Tuple[str, str, str, str]]:
 	"""Returns a list of transatable strings from a code file
 
 	:param path: path of the code file
@@ -571,7 +571,7 @@ def get_messages_from_file(path):
 
 	frappe.flags.scanned_files.append(path)
 
-	apps_path = get_bench_dir()
+	bench_path = get_bench_path()
 	if os.path.exists(path):
 		with open(path, 'r') as sourcefile:
 			try:
@@ -579,11 +579,12 @@ def get_messages_from_file(path):
 			except Exception:
 				print("Could not scan file for translation: {0}".format(path))
 				return []
-			data = [(os.path.relpath(path, apps_path), message, context, line) \
-				for line, message, context in extract_messages_from_code(file_contents)]
-			return data
+
+			return [
+				(os.path.relpath(path, bench_path), message, context, line)
+				for (line, message, context) in extract_messages_from_code(file_contents)
+			]
 	else:
-		# print "Translate: {0} missing".format(os.path.abspath(path))
 		return []
 
 def extract_messages_from_code(code):
@@ -797,9 +798,6 @@ def deduplicate_messages(messages):
 		ret.append(next(g))
 	return ret
 
-def get_bench_dir():
-	return os.path.join(frappe.__file__, '..', '..', '..', '..')
-
 def rename_language(old_name, new_name):
 	if not frappe.db.exists('Language', new_name):
 		return