From e5857fa56ad651217e2300b991704f6fc8b1bd6c Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 8 Feb 2022 19:58:56 +0530 Subject: [PATCH] fix: improve setup wizard exception email --- frappe/desk/page/setup_wizard/setup_wizard.py | 29 ++----------------- requirements.txt | 3 +- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 8dc010e420..0c32e886f4 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -6,7 +6,6 @@ from frappe.utils import strip, cint from frappe.translate import (set_default_language, get_dict, send_translations) from frappe.geo.country_info import get_country_info from frappe.utils.password import update_password -from ua_parser import user_agent_parser from . import install_fixtures def get_setup_stages(args): @@ -342,16 +341,13 @@ def email_setup_wizard_exception(traceback, args): #### Basic Information - **Site:** {site} -- **User:** {user} -- **Browser:** {browser} -- **Browser Languages**: `{accept_languages}`""".format( +- **User:** {user}""".format( site=frappe.local.site, traceback=traceback, args="\n".join(pretty_args), user=frappe.session.user, - browser=get_browser_string(), headers=frappe.request.headers, - accept_languages=", ".join(frappe.request.accept_languages.values())) + ) frappe.sendmail(recipients=frappe.conf.setup_wizard_exception_email, sender=frappe.session.user, @@ -359,27 +355,6 @@ def email_setup_wizard_exception(traceback, args): message=message, delayed=False) -def get_browser_string(): - if not frappe.request: - return "" - - user_agent = user_agent_parser.ParseUserAgent( - frappe.request.headers.get('User-Agent', '') - ) - - browser = user_agent["family"] - - if user_agent["major"]: - browser += " " + user_agent["major"] - - if user_agent["minor"]: - browser += "." + user_agent["minor"] - - if user_agent["patch"]: - browser += "." + user_agent["patch"] - - return browser - def log_setup_wizard_exception(traceback, args): with open('../logs/setup-wizard.log', 'w+') as setup_log: setup_log.write(traceback) diff --git a/requirements.txt b/requirements.txt index 4426ef54be..2e05159203 100644 --- a/requirements.txt +++ b/requirements.txt @@ -62,9 +62,8 @@ semantic-version~=2.8.5 sqlparse~=0.4.1 stripe~=2.56.0 terminaltables~=3.1.0 -ua-parser~=0.10.0 urllib3~=1.26.4 -Werkzeug~=2.0.2 +Werkzeug~=2.0.3 Whoosh~=2.7.4 wrapt~=1.12.1 xlrd~=2.0.1