Merge pull request #17385 from ankush/duplicate_tracebacks

fix: remove duplicate tracebacks

frappe/app.py

@@ -222,10 +222,6 @@ def handle_exception(e):
 		or (frappe.local.request.path.startswith("/api/") and not accept_header.startswith("text"))
 	)
 
-	if frappe.conf.get("developer_mode"):
-		# don't fail silently
-		print(frappe.get_traceback())
-
 	if respond_as_json:
 		# handle ajax responses first
 		# if the request is ajax, send back the trace or error message
@@ -289,6 +285,10 @@ def handle_exception(e):
 	if return_as_message:
 		response = get_response("message", http_status_code=http_status_code)
 
+	if frappe.conf.get("developer_mode") and not respond_as_json:
+		# don't fail silently for non-json response errors
+		print(frappe.get_traceback())
+
 	return response
 
 

frappe/database/database.py

@@ -1157,10 +1157,7 @@ class Database:
 		return INDEX_PATTERN.sub(r"", index_name)
 
 	def get_system_setting(self, key):
-		def _load_system_settings():
-			return self.get_singles_dict("System Settings")
-
-		return frappe.cache().get_value("system_settings", _load_system_settings).get(key)
+		return frappe.get_system_settings(key)
 
 	def close(self):
 		"""Close database connection."""

frappe/desk/form/load.py

@@ -50,7 +50,6 @@ def getdoc(doctype, name, user=None):
 		get_docinfo(doc)
 
 	except Exception:
-		frappe.errprint(frappe.utils.get_traceback())
 		raise
 
 	doc.add_seen()

frappe/desk/form/save.py

@@ -10,42 +10,33 @@ from frappe.desk.form.load import run_onload
 @frappe.whitelist()
 def savedocs(doc, action):
 	"""save / submit / update doclist"""
-	try:
-		doc = frappe.get_doc(json.loads(doc))
-		set_local_name(doc)
+	doc = frappe.get_doc(json.loads(doc))
+	set_local_name(doc)
 
-		# action
-		doc.docstatus = {"Save": 0, "Submit": 1, "Update": 1, "Cancel": 2}[action]
+	# action
+	doc.docstatus = {"Save": 0, "Submit": 1, "Update": 1, "Cancel": 2}[action]
 
-		if doc.docstatus == 1:
-			doc.submit()
-		else:
-			doc.save()
+	if doc.docstatus == 1:
+		doc.submit()
+	else:
+		doc.save()
 
-		# update recent documents
-		run_onload(doc)
-		send_updated_docs(doc)
+	# update recent documents
+	run_onload(doc)
+	send_updated_docs(doc)
 
-		frappe.msgprint(frappe._("Saved"), indicator="green", alert=True)
-	except Exception:
-		frappe.errprint(frappe.utils.get_traceback())
-		raise
+	frappe.msgprint(frappe._("Saved"), indicator="green", alert=True)
 
 
 @frappe.whitelist()
 def cancel(doctype=None, name=None, workflow_state_fieldname=None, workflow_state=None):
 	"""cancel a doclist"""
-	try:
-		doc = frappe.get_doc(doctype, name)
-		if workflow_state_fieldname and workflow_state:
-			doc.set(workflow_state_fieldname, workflow_state)
-		doc.cancel()
-		send_updated_docs(doc)
-		frappe.msgprint(frappe._("Cancelled"), indicator="red", alert=True)
-
-	except Exception:
-		frappe.errprint(frappe.utils.get_traceback())
-		raise
+	doc = frappe.get_doc(doctype, name)
+	if workflow_state_fieldname and workflow_state:
+		doc.set(workflow_state_fieldname, workflow_state)
+	doc.cancel()
+	send_updated_docs(doc)
+	frappe.msgprint(frappe._("Cancelled"), indicator="red", alert=True)
 
 
 def send_updated_docs(doc):