From 1934340a1b81313b191381206c3dc6aa3fdedac1 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sun, 20 Mar 2022 01:46:27 +0100
Subject: [PATCH 1/2] refactor: don't assign variable to itself

---
 frappe/handler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 frappe/handler.py

diff --git a/frappe/handler.py b/frappe/handler.py
old mode 100755
new mode 100644
index 3fd1c096e4..07c7d7a30c
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -250,7 +250,7 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 	try:
 		args = json.loads(args)
 	except ValueError:
-		args = args
+		pass
 
 	method_obj = getattr(doc, method)
 	fn = getattr(method_obj, '__func__', method_obj)

From f650408daa0da57d0ce9072eb4a5b2f244b0e4bd Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:02:44 +0100
Subject: [PATCH 2/2] refactor: use frappe.parse_json

---
 frappe/handler.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/frappe/handler.py b/frappe/handler.py
index 07c7d7a30c..ebc72da937 100644
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -225,11 +225,10 @@ def ping():
 
 def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 	"""run a whitelisted controller method"""
-	import json
-	import inspect
+	from inspect import getfullargspec
 
-	if not args:
-		args = arg or ""
+	if not args and arg:
+		args = arg
 
 	if dt: # not called from a doctype (from a page)
 		if not dn:
@@ -237,9 +236,7 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 		doc = frappe.get_doc(dt, dn)
 
 	else:
-		if isinstance(docs, str):
-			docs = json.loads(docs)
-
+		docs = frappe.parse_json(docs)
 		doc = frappe.get_doc(docs)
 		doc._original_modified = doc.modified
 		doc.check_if_latest()
@@ -248,7 +245,7 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 		throw_permission_error()
 
 	try:
-		args = json.loads(args)
+		args = frappe.parse_json(args)
 	except ValueError:
 		pass
 
@@ -257,7 +254,7 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 	is_whitelisted(fn)
 	is_valid_http_method(fn)
 
-	fnargs = inspect.getfullargspec(method_obj).args
+	fnargs = getfullargspec(method_obj).args
 
 	if not fnargs or (len(fnargs)==1 and fnargs[0]=="self"):
 		response = doc.run_method(method)