style: Format code for better readability

* Remove trailing whitespaces
* Format code to fit module conventions
* Add appropriate new lines between imports, classes, fn defs, etc
* Added comments, docstrings & module headers
This commit is contained in:
Gavin D'souza 2021-07-28 18:55:27 +05:30
parent a02848849d
commit 01d275f667
26 changed files with 72 additions and 94 deletions

View file

@ -44,5 +44,6 @@ def clear_activity_logs(days=None):
if not days:
days = 90
frappe.db.sql("""delete from `tabActivity Log` where \
creation< (NOW() - INTERVAL '{0}' DAY)""".format(days))

View file

@ -26,12 +26,15 @@ def update_feed(doc, method=None):
feed = frappe._dict(feed)
doctype = feed.doctype or doc.doctype
name = feed.name or doc.name
name = feed.name or doc.name
# delete earlier feed
frappe.db.delete("Activity Log", {
"reference_doctype": doctype,
"reference_name": name,
"link_doctype": feed.link_doctype
})
frappe.get_doc({
"doctype": "Activity Log",
"reference_doctype": doctype,

View file

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, Frappe Technologies and contributors
# Copyright (c) 2021, Frappe Technologies and contributors
# For license information, please see license.txt
import json
@ -13,6 +12,7 @@ from frappe.model.document import Document
from frappe.utils import get_datetime, now_datetime
from frappe.utils.background_jobs import enqueue, get_jobs
class ScheduledJobType(Document):
def autoname(self):
self.name = ".".join(self.method.split(".")[-2:])
@ -109,10 +109,9 @@ class ScheduledJobType(Document):
return 'long' if ('Long' in self.frequency) else 'default'
def on_trash(self):
frappe.db.delete("Scheduled Job Log", {
"scheduled_job_type": self.name
})
frappe.db.delete("Scheduled Job Log", {"scheduled_job_type": self.name})
@frappe.whitelist()
def execute_event(doc: str):
frappe.only_for("System Manager")

View file

@ -18,6 +18,7 @@ from frappe.rate_limiter import rate_limit
from frappe.utils.background_jobs import enqueue
from frappe.core.doctype.user_type.user_type import user_linked_with_permission_on_doctype
STANDARD_USERS = ("Guest", "Administrator")
@ -366,6 +367,7 @@ class User(Document):
if getattr(frappe.local, "login_manager", None):
frappe.local.login_manager.logout(user=self.name)
# delete todos
frappe.db.delete("ToDo", {"owner": self.name})
frappe.db.sql("""UPDATE `tabToDo` SET `assigned_by`=NULL WHERE `assigned_by`=%s""",
(self.name,))

View file

@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2017, Frappe Technologies and Contributors
# See license.txt
# Copyright (c) 2021, Frappe Technologies and Contributors
# See LICENSE
from frappe.core.doctype.user_permission.user_permission import add_user_permissions, remove_applicable
from frappe.permissions import has_user_permission
from frappe.core.doctype.doctype.test_doctype import new_doctype

View file

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2017, Frappe Technologies and contributors
# Copyright (c) 2021, Frappe Technologies and contributors
# For license information, please see license.txt
import frappe, json
@ -179,14 +178,16 @@ def check_applicable_doc_perm(user, doctype, docname):
@frappe.whitelist()
def clear_user_permissions(user, for_doctype):
frappe.only_for('System Manager')
total = frappe.db.count('User Permission', filters = dict(user=user, allow=for_doctype))
frappe.only_for("System Manager")
total = frappe.db.count("User Permission", {"user": user, "allow": for_doctype})
if total:
frappe.db.delete("User Permission", {
"allow": for_doctype,
"user": user,
"allow": for_doctype
})
frappe.clear_cache()
return total
@frappe.whitelist()
@ -228,37 +229,35 @@ def insert_user_perm(user, doctype, docname, is_default=0, hide_descendants=0, a
user_perm.is_default = is_default
user_perm.hide_descendants = hide_descendants
if applicable:
user_perm.applicable_for = applicable
user_perm.applicable_for = applicable
user_perm.apply_to_all_doctypes = 0
else:
user_perm.apply_to_all_doctypes = 1
user_perm.insert()
def remove_applicable(perm_applied_docs, user, doctype, docname):
for applicable_for in perm_applied_docs:
frappe.db.delete("User Permission", {
"user": user,
"applicable_for": applicable_for,
"for_value": docname,
"allow": doctype,
"for_value": docname
"user": user,
})
def remove_apply_to_all(user, doctype, docname):
def remove_apply_to_all(user, doctype, docname):
frappe.db.delete("User Permission", {
"user": user,
"apply_to_all_doctypes": 1,
"for_value": docname,
"allow": doctype,
"for_value": docname
"user": user,
})
def update_applicable(already_applied, to_apply, user, doctype, docname):
for applied in already_applied:
if applied not in to_apply:
frappe.db.delete("User Permission", {
"user": user,
"applicable_for": applied,
"for_value": docname,
"allow": doctype,
"for_value": docname
"user": user,
})

View file

@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See LICENSE
"""
Customize Form is a Single DocType used to mask the Property Setter
@ -18,13 +18,12 @@ from frappe.custom.doctype.property_setter.property_setter import delete_propert
from frappe.model.docfield import supports_translation
from frappe.core.doctype.doctype.doctype import validate_series
class CustomizeForm(Document):
def on_update(self):
frappe.db.delete("Singles", {
"doctype": "Customize Form"
})
frappe.db.delete("Singles", {"doctype": "Customize Form"})
frappe.db.delete("Customize Form Field")
@frappe.whitelist()
def fetch_to_customize(self):
self.clear_existing_doc()

View file

@ -197,9 +197,7 @@ def set_desktop_icons(visible_list, ignore_duplicate=True):
# clear all custom only if setup is not complete
if not int(frappe.defaults.get_defaults().setup_complete or 0):
frappe.db.delete("Desktop Icon", {
"standard": 0
})
frappe.db.delete("Desktop Icon", {"standard": 0})
# set standard as blocked and hidden if setting first active domain
if not frappe.flags.keep_desktop_icons:

View file

@ -338,12 +338,8 @@ def delete_events(ref_type, ref_name, delete_event=False):
total_participants = frappe.get_all("Event Participants", filters={"parenttype": "Event", "parent": participation.parent})
if len(total_participants) <= 1:
frappe.db.delete("Event", {
"name": participation.parent
})
frappe.db.delete("Event Participants", {
"name": participation.name
})
frappe.db.delete("Event", {"name": participation.parent})
frappe.db.delete("Event Participants", {"name": participation.name})
# Close events if ends_on or repeat_till is less than now_datetime
def set_status_of_events():

View file

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies and contributors
# Copyright (c) 2021, Frappe Technologies and contributors
# For license information, please see license.txt
import frappe
@ -8,6 +7,7 @@ from frappe.model.document import Document
class RouteHistory(Document):
pass
def flush_old_route_records():
"""Deletes all route records except last 500 records per user"""

View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019, Frappe Technologies and contributors
# For license information, please see license.txt
@ -124,7 +123,7 @@ def delete_tags_for_document(doc):
return
frappe.db.delete("Tag Link", {
"document_type": doc.doctype,
"document_type": doc.doctype,
"document_name": doc.name
})

View file

@ -151,11 +151,12 @@ def delete_fields(args_dict, delete=0):
fields = args_dict[dt]
if not fields:
continue
frappe.db.delete("DocField", {
"parent": dt,
"fieldname": ("in", fields)
"fieldname": ("in", fields),
})
# Delete the data/column only if delete is specified
if not delete:
continue
@ -163,7 +164,7 @@ def delete_fields(args_dict, delete=0):
if frappe.db.get_value("DocType", dt, "issingle"):
frappe.db.delete("Singles", {
"doctype": dt,
"field": ("in", fields)
"field": ("in", fields),
})
else:
existing_fields = frappe.db.multisql({

View file

@ -64,24 +64,14 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
update_flags(doc, flags, ignore_permissions)
check_permission_and_not_submitted(doc)
frappe.db.delete("Custom Field", {
"dt": name
})
frappe.db.delete("Client Script", {
"dt": name
})
frappe.db.delete("Property Setter", {
"doc_type": name
})
frappe.db.delete("Report", {
"ref_doctype": name
})
frappe.db.delete("Custom DocPerm", {
"parent": name
})
frappe.db.delete("__global_search", {
"doctype": name
})
frappe.db.delete("Custom Field", {"dt": name})
frappe.db.delete("Client Script", {"dt": name})
frappe.db.delete("Property Setter", {"doc_type": name})
frappe.db.delete("Report", {"ref_doctype": name})
frappe.db.delete("Custom DocPerm", {"parent": name})
frappe.db.delete("__global_search", {"doctype": name})
delete_from_table(doctype, name, ignore_doctypes, None)
if frappe.conf.developer_mode and not doc.custom and not (
@ -172,13 +162,9 @@ def update_naming_series(doc):
def delete_from_table(doctype, name, ignore_doctypes, doc):
if doctype!="DocType" and doctype==name:
frappe.db.delete("Singles", {
"doctype": name
})
frappe.db.delete("Singles", {"doctype": name})
else:
frappe.db.delete(doctype, {
"name": name
})
frappe.db.delete(doctype, {"name": name})
# get child tables
if doc:
tables = [d.options for d in doc.meta.get_table_fields()]
@ -356,7 +342,7 @@ def clear_timeline_references(link_doctype, link_name):
"link_doctype": link_doctype,
"link_name": link_name
})
def insert_feed(doc):
if (
frappe.flags.in_install

View file

@ -28,9 +28,8 @@ def execute():
for prop in property_setters:
property_setter_map[prop.field_name] = prop
frappe.db.delete("Property Setter", {
"name": prop.name
})
frappe.db.delete("Property Setter", {"name": prop.name})
meta = frappe.get_meta(doctype.name)
for df in meta.fields:
@ -51,7 +50,6 @@ def execute():
df = frappe.new_doc('DocField', meta, 'fields')
df.update(cf)
meta.fields.append(df)
frappe.db.delete("Custom Field", {
"name": cf.name
})
frappe.db.delete("Custom Field", {"name": cf.name})
meta.save()

View file

@ -17,6 +17,4 @@ def execute():
settings.secret_key = secret_key
settings.save(ignore_permissions=True)
frappe.db.delete("Singles", {
"doctype": "Stripe Settings"
})
frappe.db.delete("Singles", {"doctype": "Stripe Settings"})

View file

@ -2,6 +2,4 @@
import frappe
def execute():
frappe.db.delete("DocType", {
"name": "Feedback Request"
})
frappe.db.delete("DocType", {"name": "Feedback Request"})

View file

@ -11,6 +11,7 @@ def execute():
name
having count(name) > 1
''', as_dict=True)
for row in duplicate_keys:
frappe.db.delete("Series", {
"name": row.name
@ -18,4 +19,5 @@ def execute():
if row.current:
frappe.db.sql('insert into `tabSeries`(`name`, `current`) values (%(name)s, %(current)s)', row)
frappe.db.commit()
frappe.db.sql('ALTER table `tabSeries` ADD PRIMARY KEY IF NOT EXISTS (name)')

View file

@ -31,4 +31,4 @@ def execute():
# clean up
frappe.db.delete("Communication", {
"communication_type": "Comment"
})
})

View file

@ -19,4 +19,4 @@ def execute():
def twilio_settings_doctype_in_integrations() -> bool:
"""Check Twilio Settings doctype exists in integrations module or not.
"""
return frappe.db.exists("DocType", {'name': 'Twilio Settings', 'module': 'Integrations'})
return frappe.db.exists("DocType", {'name': 'Twilio Settings', 'module': 'Integrations'})

View file

@ -7,11 +7,11 @@ import frappe.share
from frappe import _, msgprint
from frappe.utils import cint
rights = ("select", "read", "write", "create", "delete", "submit", "cancel", "amend",
"print", "email", "report", "import", "export", "set_user_permissions", "share")
def check_admin_or_system_manager(user=None):
if not user: user = frappe.session.user

View file

@ -76,6 +76,7 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None):
def delete_session(sid=None, user=None, reason="Session Expired"):
from frappe.core.doctype.activity_log.feed import logout_feed
frappe.cache().hdel("session", sid)
frappe.cache().hdel("last_db_session_update", sid)
if sid and not user:

View file

@ -433,6 +433,6 @@ class TestCommands(BaseTestCommands):
for output in ["legacy", "plain", "table", "json"]:
self.execute(f"bench version -f {output}")
self.assertEqual(self.returncode, 0)
self.execute("bench version -f invalid")
self.assertEqual(self.returncode, 2)

View file

@ -176,9 +176,9 @@ def collect_error_snapshots():
def clear_old_snapshots():
"""Clear snapshots that are older than a month"""
frappe.db.sql("""delete from `tabError Snapshot`
where creation < (NOW() - INTERVAL '1' MONTH)""")
where creation < (NOW() - INTERVAL '1' MONTH)""")
path = get_error_snapshot_path()
today = datetime.datetime.now()

View file

@ -12,7 +12,5 @@ def add_custom_field(doctype, fieldname, fieldtype='Data', options=None):
}).insert()
def clear_custom_fields(doctype):
frappe.db.delete("Custom Field", {
"dt": doctype
})
frappe.db.delete("Custom Field", {"dt": doctype})
frappe.clear_cache(doctype=doctype)

View file

@ -330,6 +330,7 @@ def remove_unverified_record():
AND `creation` < (NOW() - INTERVAL '7' DAY)"""
)
@frappe.whitelist(allow_guest=True)
def confirm_deletion(email, name, host_name):
if not verify_request():

View file

@ -139,7 +139,7 @@ def clear_old_workflow_actions(doc, user=None):
"user": ("!=", user),
"status": "Open"
})
def update_completed_workflow_actions(doc, user=None):
user = user if user else frappe.session.user
frappe.db.sql("""UPDATE `tabWorkflow Action` SET `status`='Completed', `completed_by`=%s