From 4c403333c41840e5839fe4608baa82b0f23192b0 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Wed, 16 Feb 2022 16:02:37 +0530
Subject: [PATCH] fix: remove unused flag `in_setup_help`

---
 frappe/utils/jinja.py     | 27 +++++++++++----------------
 frappe/utils/safe_exec.py | 36 ++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 12d00a78d8..3702a009fb 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -97,13 +97,10 @@ def get_jloader():
 	if not getattr(frappe.local, 'jloader', None):
 		from jinja2 import ChoiceLoader, PackageLoader, PrefixLoader
 
-		if frappe.local.flags.in_setup_help:
-			apps = ['frappe']
-		else:
-			apps = frappe.get_hooks('template_apps')
-			if not apps:
-				apps = frappe.local.flags.web_pages_apps or frappe.get_installed_apps(sort=True)
-				apps.reverse()
+		apps = frappe.get_hooks('template_apps')
+		if not apps:
+			apps = frappe.local.flags.web_pages_apps or frappe.get_installed_apps(sort=True)
+			apps.reverse()
 
 		if "frappe" not in apps:
 			apps.append('frappe')
@@ -124,15 +121,13 @@ def set_filters(jenv):
 	import frappe
 	from frappe.utils import cint, cstr, flt
 
-	jenv.filters["json"] = frappe.as_json
-	jenv.filters["len"] = len
-	jenv.filters["int"] = cint
-	jenv.filters["str"] = cstr
-	jenv.filters["flt"] = flt
-
-	if frappe.flags.in_setup_help:
-		return
-
+	jenv.filters.update({
+		"json": frappe.as_json,
+		"len": len,
+		"int": cint,
+		"str": cstr,
+		"flt": flt,
+	})
 
 def get_jinja_hooks():
 	"""Returns a tuple of (methods, filters) each containing a dict of method name and method definition pair."""
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index 2042c1f2ce..5013963d1f 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -139,7 +139,21 @@ def get_safe_globals():
 			get_hooks=get_hooks,
 			enqueue=safe_enqueue,
 			sanitize_html=frappe.utils.sanitize_html,
-			log_error=frappe.log_error
+			log_error=frappe.log_error,
+			db = NamespaceDict(
+				get_list=frappe.get_list,
+				get_all=frappe.get_all,
+				get_value=frappe.db.get_value,
+				set_value=frappe.db.set_value,
+				get_single_value=frappe.db.get_single_value,
+				get_default=frappe.db.get_default,
+				exists=frappe.db.exists,
+				count=frappe.db.count,
+				escape=frappe.db.escape,
+				sql=read_sql,
+				commit=frappe.db.commit,
+				rollback=frappe.db.rollback,
+			),
 		),
 		FrappeClient=FrappeClient,
 		style=frappe._dict(
@@ -155,29 +169,11 @@ def get_safe_globals():
 		dev_server=1 if frappe._dev_server else 0,
 		run_script=run_script,
 		is_job_queued=is_job_queued,
+		get_visible_columns=get_visible_columns,
 	)
 
 	add_module_properties(frappe.exceptions, out.frappe, lambda obj: inspect.isclass(obj) and issubclass(obj, Exception))
 
-	if not frappe.flags.in_setup_help:
-		out.get_visible_columns = get_visible_columns
-		out.frappe.date_format = date_format
-		out.frappe.time_format = time_format
-		out.frappe.db = NamespaceDict(
-			get_list=frappe.get_list,
-			get_all=frappe.get_all,
-			get_value=frappe.db.get_value,
-			set_value=frappe.db.set_value,
-			get_single_value=frappe.db.get_single_value,
-			get_default=frappe.db.get_default,
-			exists=frappe.db.exists,
-			count=frappe.db.count,
-			escape=frappe.db.escape,
-			sql=read_sql,
-			commit=frappe.db.commit,
-			rollback=frappe.db.rollback,
-		)
-
 	if frappe.response:
 		out.frappe.response = frappe.response