From 5befc80cd4ed9f17bf821c50a340aeb3ed7dcc77 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 5 Sep 2021 22:30:09 +0530 Subject: [PATCH] fix(minor): linting --- frappe/core/doctype/doctype/doctype.js | 4 ++-- frappe/core/doctype/doctype/doctype.py | 2 +- frappe/core/doctype/package/package.py | 3 ++- frappe/core/doctype/package/test_package.py | 4 +++- frappe/core/doctype/package_import/package_import.py | 6 ++++-- frappe/core/doctype/package_release/package_release.py | 6 ++++-- frappe/database/database.py | 2 +- frappe/modules/import_file.py | 5 ++--- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index a6b46a9dc0..262a6efd90 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -100,10 +100,10 @@ frappe.ui.form.on('DocType', { 'Expression (old style)': 'Format: EXAMPLE-.##### Series by prefix (separated by a dot)', 'Random': '', 'By script': '' - } + }; if (frm.doc.naming_rule) { - frm.get_field('autoname').set_description(naming_rule_description[frm.doc.naming_rule]) + frm.get_field('autoname').set_description(naming_rule_description[frm.doc.naming_rule]); } }, diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 70153268f5..9bf21690fc 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -1032,7 +1032,7 @@ def validate_fields(meta): def check_max_height(docfield): if getattr(docfield, 'max_height', None) and (docfield.max_height[-2:] not in ('px', 'em')): - frappe.throw('Max for {1} height must be in px, em, rem'.format(frappe.bold(docfield.fieldname))) + frappe.throw('Max for {} height must be in px, em, rem'.format(frappe.bold(docfield.fieldname))) fields = meta.get("fields") fieldname_list = [d.fieldname for d in fields] diff --git a/frappe/core/doctype/package/package.py b/frappe/core/doctype/package/package.py index 340496079d..aa9735c061 100644 --- a/frappe/core/doctype/package/package.py +++ b/frappe/core/doctype/package/package.py @@ -1,7 +1,8 @@ # Copyright (c) 2021, Frappe Technologies and contributors # For license information, please see license.txt -import frappe, os +import frappe +import os from frappe.model.document import Document class Package(Document): diff --git a/frappe/core/doctype/package/test_package.py b/frappe/core/doctype/package/test_package.py index 21ae50d250..3fb8d48274 100644 --- a/frappe/core/doctype/package/test_package.py +++ b/frappe/core/doctype/package/test_package.py @@ -1,7 +1,9 @@ # Copyright (c) 2021, Frappe Technologies and Contributors # See license.txt -import frappe, os, json +import frappe +import os +import json import unittest class TestPackage(unittest.TestCase): diff --git a/frappe/core/doctype/package_import/package_import.py b/frappe/core/doctype/package_import/package_import.py index b307a3bff9..f4a2d666dd 100644 --- a/frappe/core/doctype/package_import/package_import.py +++ b/frappe/core/doctype/package_import/package_import.py @@ -1,7 +1,9 @@ # Copyright (c) 2021, Frappe Technologies and contributors # For license information, please see license.txt -import frappe, os, json +import frappe +import os +import json import subprocess from frappe.model.document import Document from frappe.desk.form.load import get_attachments @@ -17,7 +19,7 @@ class PackageImport(Document): attachment = get_attachments(self.doctype, self.name) if not attachment: - frappe.throw('Please attach the package') + frappe.throw(frappe._('Please attach the package')) attachment = attachment[0] diff --git a/frappe/core/doctype/package_release/package_release.py b/frappe/core/doctype/package_release/package_release.py index ea6906a190..1fb8796882 100644 --- a/frappe/core/doctype/package_release/package_release.py +++ b/frappe/core/doctype/package_release/package_release.py @@ -4,7 +4,8 @@ import frappe from frappe.model.document import Document from frappe.modules.export_file import export_doc -import os, subprocess +import os +import subprocess class PackageRelease(Document): def set_version(self): @@ -38,7 +39,8 @@ class PackageRelease(Document): for m in frappe.db.get_all('Module Def', dict(package=self.package)): module = frappe.get_doc('Module Def', m.name) for l in module.meta.links: - if l.link_doctype == 'Module Def': continue + if l.link_doctype == 'Module Def': + continue # all documents of the type in the module for d in frappe.get_all(l.link_doctype, dict(module=m.name)): export_doc(frappe.get_doc(l.link_doctype, d.name)) diff --git a/frappe/database/database.py b/frappe/database/database.py index 7a2d3e8b70..45a496a621 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -853,7 +853,7 @@ class Database(object): def _get_aggregation(self, function, dt, fieldname, filters=None): if not self.has_column(dt, fieldname): - frappe.throw('Invalid column', self.InvalidColumnName) + frappe.throw(frappe._('Invalid column'), self.InvalidColumnName) return self.get_all(dt, fields = ['%s(%s) as value' % (function, fieldname)], filters=filters)[0].get('value') or 0 @staticmethod diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index ecef0a2cc5..e7a1f5f97c 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -94,9 +94,8 @@ def update_modified(original_modified, doc): frappe.db.sql("""update tabSingles set value=%s where field="modified" and doctype=%s""", (original_modified, doc["name"])) else: - frappe.db.sql("update `tab%s` set modified=%s where name=%s" % \ - (doc['doctype'], '%s', '%s'), - (original_modified, doc['name'])) + frappe.db.sql("update `tab%s` set modified=%s where name=%s" % (doc['doctype'], + '%s', '%s'), (original_modified, doc['name'])) def import_doc(docdict, force=False, data_import=False, pre_process=None, ignore_version=None, reset_permissions=False, path=None):