vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix!: execute command

Browse source 
BREAKING: return values of bench execute are not quoted anymore
For example, `bech execute frappe.bold --arg 'hi'`
- now returns: `<strong>hi</strong>`
- instead of: `"<strong>hi</strong>"`
This commit is contained in:
David 2024-09-12 17:06:43 +02:00
parent c224a171c2
commit 0c6fffa348
No known key found for this signature in database
GPG key ID: AB15A6AF1101390D
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/commands/utils.py
View file

@ -280,7 +280,10 @@ def execute(context, method, args=None, kwargs=None, profile=False):
ret = frappe.get_attr(method)(*args, **kwargs)
except Exception:
# eval is safe here because input is from console
ret = eval(method + "(*args, **kwargs)", globals(), locals()) # nosemgrep
ret = eval(method, globals(), locals()) # nosemgrep
if callable(ret):
suffix = "(*args, **kwargs)"
ret = eval(method + suffix, globals(), locals()) # nosemgrep
if profile:
import pstats
@ -298,7 +301,7 @@ def execute(context, method, args=None, kwargs=None, profile=False):
if ret:
from frappe.utils.response import json_handler
print(json.dumps(ret, default=json_handler))
print(json.dumps(ret, default=json_handler).strip('"'))
if not context.sites:
raise SiteNotSpecifiedError

19
frappe/tests/test_commands.py
View file

@ -224,18 +224,23 @@ class TestCommands(BaseTestCommands):
self.assertEqual(self.returncode, 0)
self.assertIsInstance(float(self.stdout), float)
# test 2: execute a command expecting an errored output as local won't exist
# test 2: execute a command accessing a normal attribute
self.execute("bench --site {site} execute frappe.local.site")
self.assertEqual(self.returncode, 0)
self.assertIsNotNone(self.stderr)
# test 3: execute a command expecting an errored output as lacol won't exist
self.execute("bench --site {site} execute frappe.lacol.site")
self.assertEqual(self.returncode, 1)
self.assertIsNotNone(self.stderr)
# test 3: execute a command with kwargs
# Note:
# terminal command has been escaped to avoid .format string replacement
# The returned value has quotes which have been trimmed for the test
self.execute("""bench --site {site} execute frappe.bold --kwargs '{{"text": "DocType"}}'""")
# test 4: execute a command with kwargs
self.execute(
"bench --site {site} execute frappe.bold --kwargs '{put_here}'",
{"put_here": '{"text": "DocType"}'}, # avoid escaping errors
)
self.assertEqual(self.returncode, 0)
self.assertEqual(self.stdout[1:-1], frappe.bold(text="DocType"))
self.assertEqual(self.stdout, frappe.bold(text="DocType"))
@run_only_if(db_type_is.MARIADB)
def test_restore(self):