diff --git a/frappe/model/meta.py b/frappe/model/meta.py index cc93cdd5b6..1a78ed8569 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -10,7 +10,7 @@ Example: meta = frappe.get_meta('User') if meta.has_field('first_name'): - print "DocType" table has field "first_name" + print("DocType" table has field "first_name") ''' diff --git a/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py b/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py index 985a214e4b..09d7b42ce7 100644 --- a/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py +++ b/frappe/patches/v10_0/enable_chat_by_default_within_system_settings.py @@ -1,11 +1,12 @@ import frappe def execute(): - doc = frappe.get_single('System Settings') - doc.enable_chat = 1 + frappe.reload_doctype('System Settings') + doc = frappe.get_single('System Settings') + doc.enable_chat = 1 - # Changes prescribed by Nabin Hait (nabin@frappe.io) - doc.flags.ignore_mandatory = True - doc.flags.ignore_permissions = True + # Changes prescribed by Nabin Hait (nabin@frappe.io) + doc.flags.ignore_mandatory = True + doc.flags.ignore_permissions = True - doc.save() \ No newline at end of file + doc.save() \ No newline at end of file diff --git a/frappe/website/router.py b/frappe/website/router.py index 3395a5902b..e7c1143c41 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -253,7 +253,8 @@ def setup_source(page_info): css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css') if os.path.exists(css_path): if not '{% block style %}' in html: - css = text_type(open(css_path, 'r').read(), 'utf-8') + with io.open(css_path, 'r', encoding='utf-8') as f: + css = f.read() html += '\n{% block style %}\n\n{% endblock %}' page_info.source = html diff --git a/package.json b/package.json index 5e928bb470..82e1c73049 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frappe", "scripts": { - "build": "rollup -c", + "build": "rollup -c --silent", "production": "FRAPPE_ENV=production rollup -c", "watch": "rollup -c -w --silent" },