diff --git a/frappe/app.py b/frappe/app.py index 8e74595c15..387566627e 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -185,7 +185,7 @@ def make_form_dict(request): args = request.form or request.args if not isinstance(args, dict): - frappe.throw("Invalid request arguments") + frappe.throw(_("Invalid request arguments")) try: frappe.local.form_dict = frappe._dict({ k:v[0] if isinstance(v, (list, tuple)) else v \ diff --git a/frappe/sessions.py b/frappe/sessions.py index d949a3bed9..900f45627f 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -313,7 +313,7 @@ class Session: """, (self.sid, get_expiry_period_for_query(self.device))) if rec: - data = frappe._dict(eval(rec and rec[0][1] or '{}')) + data = frappe._dict(frappe.safe_eval(rec and rec[0][1] or '{}')) data.user = rec[0][0] else: self._delete_session() diff --git a/frappe/website/page_controllers/web_page.py b/frappe/website/page_controllers/web_page.py index d4af2860f8..2020d491e4 100644 --- a/frappe/website/page_controllers/web_page.py +++ b/frappe/website/page_controllers/web_page.py @@ -1,5 +1,4 @@ import frappe -from frappe import _ class WebPage(object): def __init__(self, path=None, http_status_code=None):