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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Frappe Bot 2019-03-23 07:23:54 +00:00
commit bd2e410a02
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -24,7 +24,7 @@ if sys.version[0] == '2':
reload(sys)
sys.setdefaultencoding("utf-8")
__version__ = '11.1.15'
__version__ = '11.1.16'
__title__ = "Frappe Framework"
local = Local()

8
frappe/utils/__init__.py
View file

@ -74,6 +74,12 @@ def extract_email_id(email):
email_id = email_id.decode("utf-8", "ignore")
return email_id
def validate_email_add(email_str, throw=False):
"""
validate_email_add will be renamed to the validate_email_address in v12
"""
return validate_email_address(email_str, throw=False)
def validate_email_address(email_str, throw=False):
"""Validates the email string"""
email = email_str = (email_str or "").strip()
@ -654,4 +660,4 @@ def get_safe_filters(filters):
# filters are not passed, not json
pass
return filters
return filters

3
frappe/utils/response.py
View file

@ -105,7 +105,8 @@ def make_logs(response = None):
if frappe.error_log:
response['exc'] = json.dumps([frappe.utils.cstr(d["exc"]) for d in frappe.local.error_log])
response['locals'] = json.dumps([frappe.utils.cstr(d["locals"]) for d in frappe.local.error_log])
if frappe.conf.developer_mode:
response['locals'] = json.dumps([frappe.utils.cstr(d["locals"]) for d in frappe.local.error_log])
if frappe.local.message_log:
response['_server_messages'] = json.dumps([frappe.utils.cstr(d) for