diff --git a/frappe/automation/doctype/assignment_rule/test_assignment_rule.py b/frappe/automation/doctype/assignment_rule/test_assignment_rule.py index da123840aa..530d45163d 100644 --- a/frappe/automation/doctype/assignment_rule/test_assignment_rule.py +++ b/frappe/automation/doctype/assignment_rule/test_assignment_rule.py @@ -249,17 +249,15 @@ class TestAutoAssign(FrappeTestCase): frappe.db.delete("Assignment Rule") assignment_rule = frappe.get_doc( - dict( - name="Assignment with Due Date", - doctype="Assignment Rule", - document_type=TEST_DOCTYPE, - assign_condition="public == 0", - due_date_based_on="expiry_date", - assignment_days=self.days, - users=[ - dict(user="test@example.com"), - ], - ) + name="Assignment with Due Date", + doctype="Assignment Rule", + document_type=TEST_DOCTYPE, + assign_condition="public == 0", + due_date_based_on="expiry_date", + assignment_days=self.days, + users=[ + dict(user="test@example.com"), + ], ).insert() expiry_date = frappe.utils.add_days(frappe.utils.nowdate(), 2) @@ -351,39 +349,35 @@ def get_assignment_rule(days, assign=None): assign = ["public == 1", "notify_on_login == 1"] assignment_rule = frappe.get_doc( - dict( - name=f"For {TEST_DOCTYPE} 1", - doctype="Assignment Rule", - priority=0, - document_type=TEST_DOCTYPE, - assign_condition=assign[0], - unassign_condition="public == 0 or notify_on_login == 1", - close_condition='"Closed" in content', - rule="Round Robin", - assignment_days=days[0], - users=[ - dict(user="test@example.com"), - dict(user="test1@example.com"), - dict(user="test2@example.com"), - ], - ) + name=f"For {TEST_DOCTYPE} 1", + doctype="Assignment Rule", + priority=0, + document_type=TEST_DOCTYPE, + assign_condition=assign[0], + unassign_condition="public == 0 or notify_on_login == 1", + close_condition='"Closed" in content', + rule="Round Robin", + assignment_days=days[0], + users=[ + dict(user="test@example.com"), + dict(user="test1@example.com"), + dict(user="test2@example.com"), + ], ).insert() frappe.delete_doc_if_exists("Assignment Rule", f"For {TEST_DOCTYPE} 2") # 2nd rule frappe.get_doc( - dict( - name=f"For {TEST_DOCTYPE} 2", - doctype="Assignment Rule", - priority=1, - document_type=TEST_DOCTYPE, - assign_condition=assign[1], - unassign_condition="notify_on_login == 0", - rule="Round Robin", - assignment_days=days[1], - users=[dict(user="test3@example.com")], - ) + name=f"For {TEST_DOCTYPE} 2", + doctype="Assignment Rule", + priority=1, + document_type=TEST_DOCTYPE, + assign_condition=assign[1], + unassign_condition="notify_on_login == 0", + rule="Round Robin", + assignment_days=days[1], + users=[dict(user="test3@example.com")], ).insert() return assignment_rule diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index 65d26a154c..b6ef8301fb 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -41,7 +41,7 @@ class TestAutoRepeat(FrappeTestCase): def test_daily_auto_repeat(self): todo = frappe.get_doc( - dict(doctype="ToDo", description="test recurring todo", assigned_by="Administrator") + doctype="ToDo", description="test recurring todo", assigned_by="Administrator" ).insert() doc = make_auto_repeat(reference_document=todo.name) @@ -61,7 +61,7 @@ class TestAutoRepeat(FrappeTestCase): def test_weekly_auto_repeat(self): todo = frappe.get_doc( - dict(doctype="ToDo", description="test weekly todo", assigned_by="Administrator") + doctype="ToDo", description="test weekly todo", assigned_by="Administrator" ).insert() doc = make_auto_repeat( @@ -87,7 +87,7 @@ class TestAutoRepeat(FrappeTestCase): def test_weekly_auto_repeat_with_weekdays(self): todo = frappe.get_doc( - dict(doctype="ToDo", description="test auto repeat with weekdays", assigned_by="Administrator") + doctype="ToDo", description="test auto repeat with weekdays", assigned_by="Administrator" ).insert() weekdays = list(week_map.keys()) @@ -117,17 +117,13 @@ class TestAutoRepeat(FrappeTestCase): end_date = add_months(start_date, 12) todo = frappe.get_doc( - dict(doctype="ToDo", description="test recurring todo", assigned_by="Administrator") + doctype="ToDo", description="test recurring todo", assigned_by="Administrator" ).insert() self.monthly_auto_repeat("ToDo", todo.name, start_date, end_date) # test without end_date todo = frappe.get_doc( - dict( - doctype="ToDo", - description="test recurring todo without end_date", - assigned_by="Administrator", - ) + doctype="ToDo", description="test recurring todo without end_date", assigned_by="Administrator" ).insert() self.monthly_auto_repeat("ToDo", todo.name, start_date) @@ -163,11 +159,7 @@ class TestAutoRepeat(FrappeTestCase): def test_email_notification(self): todo = frappe.get_doc( - dict( - doctype="ToDo", - description="Test recurring notification attachment", - assigned_by="Administrator", - ) + doctype="ToDo", description="Test recurring notification attachment", assigned_by="Administrator" ).insert() doc = make_auto_repeat( @@ -189,9 +181,7 @@ class TestAutoRepeat(FrappeTestCase): def test_next_schedule_date(self): current_date = getdate(today()) todo = frappe.get_doc( - dict( - doctype="ToDo", description="test next schedule date for monthly", assigned_by="Administrator" - ) + doctype="ToDo", description="test next schedule date for monthly", assigned_by="Administrator" ).insert() doc = make_auto_repeat( frequency="Monthly", reference_document=todo.name, start_date=add_months(today(), -2) @@ -202,7 +192,7 @@ class TestAutoRepeat(FrappeTestCase): self.assertTrue(doc.next_schedule_date >= current_date) todo = frappe.get_doc( - dict(doctype="ToDo", description="test next schedule date for daily", assigned_by="Administrator") + doctype="ToDo", description="test next schedule date for daily", assigned_by="Administrator" ).insert() doc = make_auto_repeat( frequency="Daily", reference_document=todo.name, start_date=add_days(today(), -2) @@ -214,7 +204,7 @@ class TestAutoRepeat(FrappeTestCase): create_submittable_doctype(doctype) current_date = getdate() - submittable_doc = frappe.get_doc(dict(doctype=doctype, test="test submit on creation")).insert() + submittable_doc = frappe.get_doc(doctype=doctype, test="test submit on creation").insert() submittable_doc.submit() doc = make_auto_repeat( frequency="Daily", diff --git a/frappe/automation/doctype/milestone_tracker/milestone_tracker.py b/frappe/automation/doctype/milestone_tracker/milestone_tracker.py index 54326b9ebf..fcda060c58 100644 --- a/frappe/automation/doctype/milestone_tracker/milestone_tracker.py +++ b/frappe/automation/doctype/milestone_tracker/milestone_tracker.py @@ -32,15 +32,13 @@ class MilestoneTracker(Document): from_value = before_save and before_save.get(self.track_field) or None if from_value != doc.get(self.track_field): frappe.get_doc( - dict( - doctype="Milestone", - reference_type=doc.doctype, - reference_name=doc.name, - track_field=self.track_field, - from_value=from_value, - value=doc.get(self.track_field), - milestone_tracker=self.name, - ) + doctype="Milestone", + reference_type=doc.doctype, + reference_name=doc.name, + track_field=self.track_field, + from_value=from_value, + value=doc.get(self.track_field), + milestone_tracker=self.name, ).insert(ignore_permissions=True) diff --git a/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py b/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py index 4316edd1ca..2fba6bf4ad 100644 --- a/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py +++ b/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py @@ -12,10 +12,10 @@ class TestMilestoneTracker(FrappeTestCase): frappe.cache.delete_key("milestone_tracker_map") milestone_tracker = frappe.get_doc( - dict(doctype="Milestone Tracker", document_type="ToDo", track_field="status") + doctype="Milestone Tracker", document_type="ToDo", track_field="status" ).insert() - todo = frappe.get_doc(dict(doctype="ToDo", description="test milestone", status="Open")).insert() + todo = frappe.get_doc(doctype="ToDo", description="test milestone", status="Open").insert() milestones = frappe.get_all( "Milestone", diff --git a/frappe/core/doctype/comment/test_comment.py b/frappe/core/doctype/comment/test_comment.py index af18b1fd9e..12251718e8 100644 --- a/frappe/core/doctype/comment/test_comment.py +++ b/frappe/core/doctype/comment/test_comment.py @@ -11,7 +11,7 @@ from frappe.website.doctype.blog_post.test_blog_post import make_test_blog class TestComment(FrappeTestCase): def test_comment_creation(self): - test_doc = frappe.get_doc(dict(doctype="ToDo", description="test")) + test_doc = frappe.get_doc(doctype="ToDo", description="test") test_doc.insert() comment = test_doc.add_comment("Comment", "test comment") diff --git a/frappe/core/doctype/docshare/test_docshare.py b/frappe/core/doctype/docshare/test_docshare.py index e9ed34a7b8..9edf78405f 100644 --- a/frappe/core/doctype/docshare/test_docshare.py +++ b/frappe/core/doctype/docshare/test_docshare.py @@ -136,7 +136,7 @@ class TestDocShare(FrappeTestCase): doctype = "Test DocShare with Submit" create_submittable_doctype(doctype, submit_perms=0) - submittable_doc = frappe.get_doc(dict(doctype=doctype, test="test docshare with submit")).insert() + submittable_doc = frappe.get_doc(doctype=doctype, test="test docshare with submit").insert() frappe.set_user(self.user) self.assertFalse(frappe.has_permission(doctype, "submit", user=self.user)) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 40b3b31b61..f079e506ff 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -1801,7 +1801,7 @@ def make_module_and_roles(doc, perm_fieldname="permissions"): and doc.restrict_to_domain and not frappe.db.exists("Domain", doc.restrict_to_domain) ): - frappe.get_doc(dict(doctype="Domain", domain=doc.restrict_to_domain)).insert() + frappe.get_doc(doctype="Domain", domain=doc.restrict_to_domain).insert() if "tabModule Def" in frappe.db.get_tables() and not frappe.db.exists("Module Def", doc.module): m = frappe.get_doc({"doctype": "Module Def", "module_name": doc.module}) diff --git a/frappe/core/doctype/document_naming_rule/test_document_naming_rule.py b/frappe/core/doctype/document_naming_rule/test_document_naming_rule.py index 60e6803a1a..0747b97025 100644 --- a/frappe/core/doctype/document_naming_rule/test_document_naming_rule.py +++ b/frappe/core/doctype/document_naming_rule/test_document_naming_rule.py @@ -7,11 +7,11 @@ from frappe.tests.utils import FrappeTestCase class TestDocumentNamingRule(FrappeTestCase): def test_naming_rule_by_series(self): naming_rule = frappe.get_doc( - dict(doctype="Document Naming Rule", document_type="ToDo", prefix="test-todo-", prefix_digits=5) + doctype="Document Naming Rule", document_type="ToDo", prefix="test-todo-", prefix_digits=5 ).insert() todo = frappe.get_doc( - dict(doctype="ToDo", description="Is this my name " + frappe.generate_hash()) + doctype="ToDo", description="Is this my name " + frappe.generate_hash() ).insert() self.assertEqual(todo.name, "test-todo-00001") @@ -21,14 +21,12 @@ class TestDocumentNamingRule(FrappeTestCase): def test_naming_rule_by_condition(self): naming_rule = frappe.get_doc( - dict( - doctype="Document Naming Rule", - document_type="ToDo", - prefix="test-high-", - prefix_digits=5, - priority=10, - conditions=[dict(field="priority", condition="=", value="High")], - ) + doctype="Document Naming Rule", + document_type="ToDo", + prefix="test-high-", + prefix_digits=5, + priority=10, + conditions=[dict(field="priority", condition="=", value="High")], ).insert() # another rule @@ -46,15 +44,15 @@ class TestDocumentNamingRule(FrappeTestCase): naming_rule_2.insert() todo = frappe.get_doc( - dict(doctype="ToDo", priority="High", description="Is this my name " + frappe.generate_hash()) + doctype="ToDo", priority="High", description="Is this my name " + frappe.generate_hash() ).insert() todo_1 = frappe.get_doc( - dict(doctype="ToDo", priority="Medium", description="Is this my name " + frappe.generate_hash()) + doctype="ToDo", priority="Medium", description="Is this my name " + frappe.generate_hash() ).insert() todo_2 = frappe.get_doc( - dict(doctype="ToDo", priority="Low", description="Is this my name " + frappe.generate_hash()) + doctype="ToDo", priority="Low", description="Is this my name " + frappe.generate_hash() ).insert() try: diff --git a/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py b/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py index ef61724d94..237d8108c9 100644 --- a/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py +++ b/frappe/core/doctype/document_naming_settings/test_document_naming_settings.py @@ -89,16 +89,12 @@ class TestNamingSeries(FrappeTestCase): self.dns.update_amendment_rule() submittable_doc = frappe.get_doc( - dict(doctype=self.ns_doctype, some_fieldname="test doc with submit") + doctype=self.ns_doctype, some_fieldname="test doc with submit" ).submit() submittable_doc.cancel() amended_doc = frappe.get_doc( - dict( - doctype=self.ns_doctype, - some_fieldname="test doc with submit", - amended_from=submittable_doc.name, - ) + doctype=self.ns_doctype, some_fieldname="test doc with submit", amended_from=submittable_doc.name ).insert() self.assertIn(submittable_doc.name, amended_doc.name) @@ -108,10 +104,6 @@ class TestNamingSeries(FrappeTestCase): self.dns.update_amendment_rule() new_amended_doc = frappe.get_doc( - dict( - doctype=self.ns_doctype, - some_fieldname="test doc with submit", - amended_from=submittable_doc.name, - ) + doctype=self.ns_doctype, some_fieldname="test doc with submit", amended_from=submittable_doc.name ).insert() self.assertNotIn(submittable_doc.name, new_amended_doc.name) diff --git a/frappe/core/doctype/domain/domain.py b/frappe/core/doctype/domain/domain.py index a27e3e4b61..aa4b43a9ee 100644 --- a/frappe/core/doctype/domain/domain.py +++ b/frappe/core/doctype/domain/domain.py @@ -79,7 +79,7 @@ class Domain(Document): for role_name in self.data.restricted_roles: user.append("roles", {"role": role_name}) if not frappe.db.get_value("Role", role_name): - frappe.get_doc(dict(doctype="Role", role_name=role_name)).insert() + frappe.get_doc(doctype="Role", role_name=role_name).insert() continue role = frappe.get_doc("Role", role_name) diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index a809c743c0..e2464854e4 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -52,7 +52,7 @@ class DomainSettings(Document): for domain in all_domains: data = frappe.get_domain_data(domain) if not frappe.db.get_value("Domain", domain): - frappe.get_doc(dict(doctype="Domain", domain=domain)).insert() + frappe.get_doc(doctype="Domain", domain=domain).insert() if "modules" in data: for module in data.get("modules"): frappe.db.set_value("Module Def", module, "restrict_to_domain", domain) @@ -60,7 +60,7 @@ class DomainSettings(Document): if "restricted_roles" in data: for role in data["restricted_roles"]: if not frappe.db.get_value("Role", role): - frappe.get_doc(dict(doctype="Role", role_name=role)).insert() + frappe.get_doc(doctype="Role", role_name=role).insert() frappe.db.set_value("Role", role, "restrict_to_domain", domain) if domain not in active_domains: diff --git a/frappe/core/doctype/package/test_package.py b/frappe/core/doctype/package/test_package.py index 0120a095ac..25c5187701 100644 --- a/frappe/core/doctype/package/test_package.py +++ b/frappe/core/doctype/package/test_package.py @@ -17,7 +17,7 @@ class TestPackage(FrappeTestCase): make_test_web_page() # make release - frappe.get_doc(dict(doctype="Package Release", package="Test Package", publish=1)).insert() + frappe.get_doc(doctype="Package Release", package="Test Package", publish=1).insert() self.assertTrue(os.path.exists(frappe.get_site_path("packages", "test-package"))) self.assertTrue( @@ -53,60 +53,52 @@ class TestPackage(FrappeTestCase): def make_test_package(): if not frappe.db.exists("Package", "Test Package"): frappe.get_doc( - dict(doctype="Package", name="Test Package", package_name="test-package", readme="# Test Package") + doctype="Package", name="Test Package", package_name="test-package", readme="# Test Package" ).insert() def make_test_module(): if not frappe.db.exists("Module Def", "Test Module for Package"): frappe.get_doc( - dict( - doctype="Module Def", - module_name="Test Module for Package", - custom=1, - app_name="frappe", - package="Test Package", - ) + doctype="Module Def", + module_name="Test Module for Package", + custom=1, + app_name="frappe", + package="Test Package", ).insert() def make_test_doctype(): if not frappe.db.exists("DocType", "Test DocType for Package"): frappe.get_doc( - dict( - doctype="DocType", - name="Test DocType for Package", - custom=1, - module="Test Module for Package", - autoname="Prompt", - fields=[dict(fieldname="test_field", fieldtype="Data", label="Test Field")], - ) + doctype="DocType", + name="Test DocType for Package", + custom=1, + module="Test Module for Package", + autoname="Prompt", + fields=[dict(fieldname="test_field", fieldtype="Data", label="Test Field")], ).insert() def make_test_server_script(): if not frappe.db.exists("Server Script", "Test Script for Package"): frappe.get_doc( - dict( - doctype="Server Script", - name="Test Script for Package", - module="Test Module for Package", - script_type="DocType Event", - reference_doctype="Test DocType for Package", - doctype_event="Before Save", - script='frappe.msgprint("Test")', - ) + doctype="Server Script", + name="Test Script for Package", + module="Test Module for Package", + script_type="DocType Event", + reference_doctype="Test DocType for Package", + doctype_event="Before Save", + script='frappe.msgprint("Test")', ).insert() def make_test_web_page(): if not frappe.db.exists("Web Page", "test-web-page-for-package"): frappe.get_doc( - dict( - doctype="Web Page", - module="Test Module for Package", - main_section="Some content", - published=1, - title="Test Web Page for Package", - ) + doctype="Web Page", + module="Test Module for Package", + main_section="Some content", + published=1, + title="Test Web Page for Package", ).insert() diff --git a/frappe/core/doctype/package_release/package_release.py b/frappe/core/doctype/package_release/package_release.py index 639a7045be..faf9369a9c 100644 --- a/frappe/core/doctype/package_release/package_release.py +++ b/frappe/core/doctype/package_release/package_release.py @@ -116,12 +116,10 @@ class PackageRelease(Document): # make attachment file = frappe.get_doc( - dict( - doctype="File", - file_url="/" + os.path.join("files", filename), - attached_to_doctype=self.doctype, - attached_to_name=self.name, - ) + doctype="File", + file_url="/" + os.path.join("files", filename), + attached_to_doctype=self.doctype, + attached_to_name=self.name, ) file.flags.ignore_duplicate_entry_error = True diff --git a/frappe/core/doctype/page/test_page.py b/frappe/core/doctype/page/test_page.py index d8cf90b8d9..82208be1c1 100644 --- a/frappe/core/doctype/page/test_page.py +++ b/frappe/core/doctype/page/test_page.py @@ -14,7 +14,7 @@ class TestPage(FrappeTestCase): def test_naming(self): self.assertRaises( frappe.NameError, - frappe.get_doc(dict(doctype="Page", page_name="DocType", module="Core")).insert, + frappe.get_doc(doctype="Page", page_name="DocType", module="Core").insert, ) @unittest.skipUnless( diff --git a/frappe/core/doctype/role/test_role.py b/frappe/core/doctype/role/test_role.py index 7e751d6dc9..1ab5a29f39 100644 --- a/frappe/core/doctype/role/test_role.py +++ b/frappe/core/doctype/role/test_role.py @@ -30,9 +30,9 @@ class TestUser(FrappeTestCase): frappe.delete_doc_if_exists("User", "test-user-for-desk-access@example.com") frappe.delete_doc_if_exists("Role", "desk-access-test") user = frappe.get_doc( - dict(doctype="User", email="test-user-for-desk-access@example.com", first_name="test") + doctype="User", email="test-user-for-desk-access@example.com", first_name="test" ).insert() - role = frappe.get_doc(dict(doctype="Role", role_name="desk-access-test", desk_access=0)).insert() + role = frappe.get_doc(doctype="Role", role_name="desk-access-test", desk_access=0).insert() user.add_roles(role.name) user.save() self.assertTrue(user.user_type == "Website User") diff --git a/frappe/core/doctype/role_profile/test_role_profile.py b/frappe/core/doctype/role_profile/test_role_profile.py index 10fd4ddc25..3e89469ddb 100644 --- a/frappe/core/doctype/role_profile/test_role_profile.py +++ b/frappe/core/doctype/role_profile/test_role_profile.py @@ -9,7 +9,7 @@ test_dependencies = ["Role"] class TestRoleProfile(FrappeTestCase): def test_make_new_role_profiles(self): frappe.delete_doc_if_exists("Role Profile", "Test 1", force=1) - new_role_profile = frappe.get_doc(dict(doctype="Role Profile", role_profile="Test 1")).insert() + new_role_profile = frappe.get_doc(doctype="Role Profile", role_profile="Test 1").insert() self.assertEqual(new_role_profile.role_profile, "Test 1") @@ -52,20 +52,20 @@ class TestRoleProfile(FrappeTestCase): frappe.delete_doc_if_exists("Role Profile", "_Test Role Profile 1", force=1) frappe.delete_doc_if_exists("Role Profile", "_Test Role Profile 2", force=1) - role_profile_one = frappe.get_doc( - dict(doctype="Role Profile", role_profile="_Test Role Profile 1") - ).insert(ignore_if_duplicate=True) - role_profile_two = frappe.get_doc( - dict(doctype="Role Profile", role_profile="_Test Role Profile 2") - ).insert(ignore_if_duplicate=True) + role_profile_one = frappe.get_doc(doctype="Role Profile", role_profile="_Test Role Profile 1").insert( + ignore_if_duplicate=True + ) + role_profile_two = frappe.get_doc(doctype="Role Profile", role_profile="_Test Role Profile 2").insert( + ignore_if_duplicate=True + ) self.assertEqual(role_profile_one.role_profile, "_Test Role Profile 1") self.assertEqual(role_profile_two.role_profile, "_Test Role Profile 2") # Create new role for test - frappe.get_doc(dict(doctype="Role", role_name="_Test Role 1")).insert(ignore_if_duplicate=True) - frappe.get_doc(dict(doctype="Role", role_name="_Test Role 2")).insert(ignore_if_duplicate=True) - frappe.get_doc(dict(doctype="Role", role_name="_Test Role 3")).insert(ignore_if_duplicate=True) + frappe.get_doc(doctype="Role", role_name="_Test Role 1").insert(ignore_if_duplicate=True) + frappe.get_doc(doctype="Role", role_name="_Test Role 2").insert(ignore_if_duplicate=True) + frappe.get_doc(doctype="Role", role_name="_Test Role 3").insert(ignore_if_duplicate=True) # add role role_profile_one.update({"roles": [{"role": "_Test Role 1"}, {"role": "_Test Role 2"}]}) role_profile_one.save() diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 3530d85923..ccab34d93c 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -149,7 +149,7 @@ class ScheduledJobType(Document): return if not self.scheduler_log: self.scheduler_log = frappe.get_doc( - dict(doctype="Scheduled Job Log", scheduled_job_type=self.name) + doctype="Scheduled Job Log", scheduled_job_type=self.name ).insert(ignore_permissions=True) self.scheduler_log.db_set("status", status) if frappe.debug_log: diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index e7735c8fc9..ee4782f9d3 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -111,14 +111,14 @@ class TestServerScript(FrappeTestCase): frappe.cache.delete_value("server_script_map") def test_doctype_event(self): - todo = frappe.get_doc(dict(doctype="ToDo", description="hello")).insert() + todo = frappe.get_doc(doctype="ToDo", description="hello").insert() self.assertEqual(todo.status, "Open") - todo = frappe.get_doc(dict(doctype="ToDo", description="test todo")).insert() + todo = frappe.get_doc(doctype="ToDo", description="test todo").insert() self.assertEqual(todo.status, "Closed") self.assertRaises( - frappe.ValidationError, frappe.get_doc(dict(doctype="ToDo", description="validate me")).insert + frappe.ValidationError, frappe.get_doc(doctype="ToDo", description="validate me").insert ) def test_api(self): @@ -157,7 +157,7 @@ class TestServerScript(FrappeTestCase): server_script.disabled = 0 server_script.save() - self.assertRaises(AttributeError, frappe.get_doc(dict(doctype="ToDo", description="test me")).insert) + self.assertRaises(AttributeError, frappe.get_doc(doctype="ToDo", description="test me").insert) server_script.disabled = 1 server_script.save() @@ -167,7 +167,7 @@ class TestServerScript(FrappeTestCase): server_script.disabled = 0 server_script.save() - self.assertRaises(AttributeError, frappe.get_doc(dict(doctype="ToDo", description="test me")).insert) + self.assertRaises(AttributeError, frappe.get_doc(doctype="ToDo", description="test me").insert) server_script.disabled = 1 server_script.save() diff --git a/frappe/core/doctype/session_default_settings/test_session_default_settings.py b/frappe/core/doctype/session_default_settings/test_session_default_settings.py index 532e805141..9d1800bc39 100644 --- a/frappe/core/doctype/session_default_settings/test_session_default_settings.py +++ b/frappe/core/doctype/session_default_settings/test_session_default_settings.py @@ -19,13 +19,13 @@ class TestSessionDefaultSettings(FrappeTestCase): set_session_default_values({"role": "Website Manager"}) todo = frappe.get_doc( - dict(doctype="ToDo", description="test session defaults set", assigned_by="Administrator") + doctype="ToDo", description="test session defaults set", assigned_by="Administrator" ).insert() self.assertEqual(todo.role, "Website Manager") def test_clear_session_defaults(self): clear_session_defaults() todo = frappe.get_doc( - dict(doctype="ToDo", description="test session defaults cleared", assigned_by="Administrator") + doctype="ToDo", description="test session defaults cleared", assigned_by="Administrator" ).insert() self.assertNotEqual(todo.role, "Website Manager") diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index d8e760814f..8ab6b9500d 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -34,7 +34,7 @@ class TestUser(FrappeTestCase): def test_user_type(self): new_user = frappe.get_doc( - dict(doctype="User", email="test-for-type@example.com", first_name="Tester") + doctype="User", email="test-for-type@example.com", first_name="Tester" ).insert(ignore_if_duplicate=True) self.assertEqual(new_user.user_type, "Website User") @@ -151,7 +151,7 @@ class TestUser(FrappeTestCase): def test_delete_user(self): new_user = frappe.get_doc( - dict(doctype="User", email="test-for-delete@example.com", first_name="Tester Delete User") + doctype="User", email="test-for-delete@example.com", first_name="Tester Delete User" ).insert(ignore_if_duplicate=True) self.assertEqual(new_user.user_type, "Website User") diff --git a/frappe/custom/doctype/doctype_layout/patches/convert_web_forms_to_doctype_layout.py b/frappe/custom/doctype/doctype_layout/patches/convert_web_forms_to_doctype_layout.py index f0c4b50fc6..df1270874a 100644 --- a/frappe/custom/doctype/doctype_layout/patches/convert_web_forms_to_doctype_layout.py +++ b/frappe/custom/doctype/doctype_layout/patches/convert_web_forms_to_doctype_layout.py @@ -5,16 +5,12 @@ def execute(): for web_form_name in frappe.get_all("Web Form", pluck="name"): web_form = frappe.get_doc("Web Form", web_form_name) doctype_layout = frappe.get_doc( - dict( - doctype="DocType Layout", - document_type=web_form.doc_type, - name=web_form.title, - route=web_form.route, - fields=[ - dict(fieldname=d.fieldname, label=d.label) - for d in web_form.web_form_fields - if d.fieldname - ], - ) + doctype="DocType Layout", + document_type=web_form.doc_type, + name=web_form.title, + route=web_form.route, + fields=[ + dict(fieldname=d.fieldname, label=d.label) for d in web_form.web_form_fields if d.fieldname + ], ).insert() print(doctype_layout.name) diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 1915c61911..7afe2258d8 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -34,17 +34,15 @@ class TestDashboardChart(FrappeTestCase): frappe.delete_doc("Dashboard Chart", "Test Dashboard Chart") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Dashboard Chart", - chart_type="Count", - document_type="DocType", - based_on="creation", - timespan="Last Year", - time_interval="Monthly", - filters_json="{}", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Dashboard Chart", + chart_type="Count", + document_type="DocType", + based_on="creation", + timespan="Last Year", + time_interval="Monthly", + filters_json="{}", + timeseries=1, ).insert() cur_date = datetime.now() - relativedelta(years=1) @@ -64,17 +62,15 @@ class TestDashboardChart(FrappeTestCase): frappe.db.delete("Error Log") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Empty Dashboard Chart", - chart_type="Count", - document_type="Error Log", - based_on="creation", - timespan="Last Year", - time_interval="Monthly", - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Empty Dashboard Chart", + chart_type="Count", + document_type="Error Log", + based_on="creation", + timespan="Last Year", + time_interval="Monthly", + filters_json="[]", + timeseries=1, ).insert() cur_date = datetime.now() - relativedelta(years=1) @@ -94,20 +90,18 @@ class TestDashboardChart(FrappeTestCase): frappe.db.delete("Error Log") # create one data point - frappe.get_doc(dict(doctype="Error Log", creation="2018-06-01 00:00:00")).insert() + frappe.get_doc(doctype="Error Log", creation="2018-06-01 00:00:00").insert() frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Empty Dashboard Chart 2", - chart_type="Count", - document_type="Error Log", - based_on="creation", - timespan="Last Year", - time_interval="Monthly", - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Empty Dashboard Chart 2", + chart_type="Count", + document_type="Error Log", + based_on="creation", + timespan="Last Year", + time_interval="Monthly", + filters_json="[]", + timeseries=1, ).insert() cur_date = datetime.now() - relativedelta(years=1) @@ -130,14 +124,12 @@ class TestDashboardChart(FrappeTestCase): frappe.get_doc({"doctype": "ToDo", "description": "test"}).insert() frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Group By Dashboard Chart", - chart_type="Group By", - document_type="ToDo", - group_by_based_on="status", - filters_json="[]", - ) + doctype="Dashboard Chart", + chart_name="Test Group By Dashboard Chart", + chart_type="Group By", + document_type="ToDo", + group_by_based_on="status", + filters_json="[]", ).insert() result = get(chart_name="Test Group By Dashboard Chart", refresh=1) @@ -152,20 +144,18 @@ class TestDashboardChart(FrappeTestCase): frappe.delete_doc("Dashboard Chart", "Test Daily Dashboard Chart") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Daily Dashboard Chart", - chart_type="Sum", - document_type="Communication", - based_on="communication_date", - value_based_on="rating", - timespan="Select Date Range", - time_interval="Daily", - from_date=datetime(2019, 1, 6), - to_date=datetime(2019, 1, 11), - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Daily Dashboard Chart", + chart_type="Sum", + document_type="Communication", + based_on="communication_date", + value_based_on="rating", + timespan="Select Date Range", + time_interval="Daily", + from_date=datetime(2019, 1, 6), + to_date=datetime(2019, 1, 11), + filters_json="[]", + timeseries=1, ).insert() result = get(chart_name="Test Daily Dashboard Chart", refresh=1) @@ -183,20 +173,18 @@ class TestDashboardChart(FrappeTestCase): frappe.delete_doc("Dashboard Chart", "Test Weekly Dashboard Chart") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Weekly Dashboard Chart", - chart_type="Sum", - document_type="Communication", - based_on="communication_date", - value_based_on="rating", - timespan="Select Date Range", - time_interval="Weekly", - from_date=datetime(2018, 12, 30), - to_date=datetime(2019, 1, 15), - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Weekly Dashboard Chart", + chart_type="Sum", + document_type="Communication", + based_on="communication_date", + value_based_on="rating", + timespan="Select Date Range", + time_interval="Weekly", + from_date=datetime(2018, 12, 30), + to_date=datetime(2019, 1, 15), + filters_json="[]", + timeseries=1, ).insert() with patch.object(frappe.utils.data, "get_first_day_of_the_week", return_value="Monday"): @@ -212,20 +200,18 @@ class TestDashboardChart(FrappeTestCase): frappe.delete_doc("Dashboard Chart", "Test Average Dashboard Chart") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Average Dashboard Chart", - chart_type="Average", - document_type="Communication", - based_on="communication_date", - value_based_on="rating", - timespan="Select Date Range", - time_interval="Weekly", - from_date=datetime(2018, 12, 30), - to_date=datetime(2019, 1, 15), - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Average Dashboard Chart", + chart_type="Average", + document_type="Communication", + based_on="communication_date", + value_based_on="rating", + timespan="Select Date Range", + time_interval="Weekly", + from_date=datetime(2018, 12, 30), + to_date=datetime(2019, 1, 15), + filters_json="[]", + timeseries=1, ).insert() with patch.object(frappe.utils.data, "get_first_day_of_the_week", return_value="Monday"): @@ -237,19 +223,17 @@ class TestDashboardChart(FrappeTestCase): frappe.delete_doc_if_exists("Dashboard Chart", "Test Dashboard Chart Date Label") frappe.get_doc( - dict( - doctype="Dashboard Chart", - chart_name="Test Dashboard Chart Date Label", - chart_type="Count", - document_type="DocType", - based_on="creation", - timespan="Select Date Range", - time_interval="Weekly", - from_date=datetime(2018, 12, 30), - to_date=datetime(2019, 1, 15), - filters_json="[]", - timeseries=1, - ) + doctype="Dashboard Chart", + chart_name="Test Dashboard Chart Date Label", + chart_type="Count", + document_type="DocType", + based_on="creation", + timespan="Select Date Range", + time_interval="Weekly", + from_date=datetime(2018, 12, 30), + to_date=datetime(2019, 1, 15), + filters_json="[]", + timeseries=1, ).insert() with patch.object(frappe.utils.data, "get_user_date_format", return_value="dd.mm.yyyy"): diff --git a/frappe/desk/doctype/note/test_note.py b/frappe/desk/doctype/note/test_note.py index 118a18b8f5..94ab270e71 100644 --- a/frappe/desk/doctype/note/test_note.py +++ b/frappe/desk/doctype/note/test_note.py @@ -13,7 +13,7 @@ class TestNote(FrappeTestCase): frappe.db.delete("Note") frappe.db.delete("Note Seen By") - return frappe.get_doc(dict(doctype="Note", title="test note", content="test note content")).insert() + return frappe.get_doc(doctype="Note", title="test note", content="test note content").insert() def test_version(self): note = self.insert_note() diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py index c79d83312b..b91ad749bc 100644 --- a/frappe/desk/doctype/system_console/system_console.py +++ b/frappe/desk/doctype/system_console/system_console.py @@ -42,7 +42,7 @@ class SystemConsole(Document): else: frappe.db.rollback() frappe.get_doc( - dict(doctype="Console Log", script=self.console, type=self.type, committed=self.commit) + doctype="Console Log", script=self.console, type=self.type, committed=self.commit ).insert() frappe.db.commit() diff --git a/frappe/desk/doctype/todo/test_todo.py b/frappe/desk/doctype/todo/test_todo.py index 4880fad9d5..231fc482f0 100644 --- a/frappe/desk/doctype/todo/test_todo.py +++ b/frappe/desk/doctype/todo/test_todo.py @@ -11,9 +11,7 @@ test_dependencies = ["User"] class TestToDo(FrappeTestCase): def test_delete(self): - todo = frappe.get_doc( - dict(doctype="ToDo", description="test todo", assigned_by="Administrator") - ).insert() + todo = frappe.get_doc(doctype="ToDo", description="test todo", assigned_by="Administrator").insert() frappe.db.delete("Deleted Document") todo.delete() @@ -24,9 +22,7 @@ class TestToDo(FrappeTestCase): self.assertEqual(todo.as_json(), deleted.data) def test_fetch(self): - todo = frappe.get_doc( - dict(doctype="ToDo", description="test todo", assigned_by="Administrator") - ).insert() + todo = frappe.get_doc(doctype="ToDo", description="test todo", assigned_by="Administrator").insert() self.assertEqual( todo.assigned_by_full_name, frappe.db.get_value("User", todo.assigned_by, "full_name") ) @@ -40,9 +36,7 @@ class TestToDo(FrappeTestCase): frappe.clear_cache(doctype="ToDo") - todo = frappe.get_doc( - dict(doctype="ToDo", description="test todo", assigned_by="Administrator") - ).insert() + todo = frappe.get_doc(doctype="ToDo", description="test todo", assigned_by="Administrator").insert() self.assertFalse(todo.assigned_by_full_name) todo_meta = frappe.get_doc("DocType", "ToDo") @@ -126,12 +120,10 @@ class TestToDo(FrappeTestCase): frappe.clear_cache(doctype="ToDo") todo = frappe.get_doc( - dict( - doctype="ToDo", - description="test todo", - assigned_by="Administrator", - assigned_by_full_name="Admin", - ) + doctype="ToDo", + description="test todo", + assigned_by="Administrator", + assigned_by_full_name="Admin", ).insert() self.assertEqual(todo.assigned_by_full_name, "Admin") diff --git a/frappe/email/doctype/auto_email_report/test_auto_email_report.py b/frappe/email/doctype/auto_email_report/test_auto_email_report.py index 1f806f22b5..2fb37eafec 100644 --- a/frappe/email/doctype/auto_email_report/test_auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/test_auto_email_report.py @@ -46,17 +46,15 @@ class TestAutoEmailReport(FrappeTestCase): def get_auto_email_report(): if not frappe.db.exists("Auto Email Report", "Permitted Documents For User"): auto_email_report = frappe.get_doc( - dict( - doctype="Auto Email Report", - report="Permitted Documents For User", - report_type="Script Report", - user="Administrator", - enabled=1, - email_to="test@example.com", - format="HTML", - frequency="Daily", - filters=json.dumps(dict(user="Administrator", doctype="DocType")), - ) + doctype="Auto Email Report", + report="Permitted Documents For User", + report_type="Script Report", + user="Administrator", + enabled=1, + email_to="test@example.com", + format="HTML", + frequency="Daily", + filters=json.dumps(dict(user="Administrator", doctype="DocType")), ).insert() else: auto_email_report = frappe.get_doc("Auto Email Report", "Permitted Documents For User") diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py index 4728881d7e..72fd813712 100644 --- a/frappe/email/doctype/email_account/test_email_account.py +++ b/frappe/email/doctype/email_account/test_email_account.py @@ -268,7 +268,7 @@ class TestEmailAccount(FrappeTestCase): frappe.db.delete("Email Queue") # reference document for testing - event = frappe.get_doc(dict(doctype="Event", subject="test-message")).insert() + event = frappe.get_doc(doctype="Event", subject="test-message").insert() # send a mail against this frappe.sendmail( diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index c6cce21a06..4463188208 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -164,13 +164,11 @@ def add_to_deleted_document(doc): """Add this document to Deleted Document table. Called after delete""" if doc.doctype != "Deleted Document" and frappe.flags.in_install != "frappe": frappe.get_doc( - dict( - doctype="Deleted Document", - deleted_doctype=doc.doctype, - deleted_name=doc.name, - data=doc.as_json(), - owner=frappe.session.user, - ) + doctype="Deleted Document", + deleted_doctype=doc.doctype, + deleted_name=doc.name, + data=doc.as_json(), + owner=frappe.session.user, ).db_insert() diff --git a/frappe/permissions.py b/frappe/permissions.py index 97e31255ef..1452d03657 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -564,16 +564,14 @@ def add_user_permission( frappe.throw(_("{0} {1} not found").format(_(doctype), name), frappe.DoesNotExistError) frappe.get_doc( - dict( - doctype="User Permission", - user=user, - allow=doctype, - for_value=name, - is_default=is_default, - applicable_for=applicable_for, - apply_to_all_doctypes=0 if applicable_for else 1, - hide_descendants=hide_descendants, - ) + doctype="User Permission", + user=user, + allow=doctype, + for_value=name, + is_default=is_default, + applicable_for=applicable_for, + apply_to_all_doctypes=0 if applicable_for else 1, + hide_descendants=hide_descendants, ).insert(ignore_permissions=ignore_permissions) diff --git a/frappe/printing/doctype/letter_head/test_letter_head.py b/frappe/printing/doctype/letter_head/test_letter_head.py index b36daeae03..39cb0c9816 100644 --- a/frappe/printing/doctype/letter_head/test_letter_head.py +++ b/frappe/printing/doctype/letter_head/test_letter_head.py @@ -7,7 +7,7 @@ from frappe.tests.utils import FrappeTestCase class TestLetterHead(FrappeTestCase): def test_auto_image(self): letter_head = frappe.get_doc( - dict(doctype="Letter Head", letter_head_name="Test", source="Image", image="/public/test.png") + doctype="Letter Head", letter_head_name="Test", source="Image", image="/public/test.png" ).insert() # test if image is automatically set diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py index 2a25ba6a4a..13f5d6cb90 100644 --- a/frappe/tests/test_auth.py +++ b/frappe/tests/test_auth.py @@ -19,7 +19,7 @@ from frappe.www.login import _generate_temporary_login_link def add_user(email, password, username=None, mobile_no=None): first_name = email.split("@", 1)[0] user = frappe.get_doc( - dict(doctype="User", email=email, first_name=first_name, username=username, mobile_no=mobile_no) + doctype="User", email=email, first_name=first_name, username=username, mobile_no=mobile_no ).insert() user.new_password = password user.simultaneous_sessions = 1 diff --git a/frappe/tests/test_boot.py b/frappe/tests/test_boot.py index 91a188e6ae..62d8e7fd6d 100644 --- a/frappe/tests/test_boot.py +++ b/frappe/tests/test_boot.py @@ -49,14 +49,12 @@ class TestPermissionQueries(FrappeTestCase): # Add permission query such that each user can only see their own custom reports frappe.get_doc( - dict( - doctype="Server Script", - name="test_report_permission_query", - script_type="Permission Query", - reference_doctype="Report", - script="""conditions = f"(`tabReport`.is_standard = 'Yes' or `tabReport`.owner = '{frappe.session.user}')" + doctype="Server Script", + name="test_report_permission_query", + script_type="Permission Query", + reference_doctype="Report", + script="""conditions = f"(`tabReport`.is_standard = 'Yes' or `tabReport`.owner = '{frappe.session.user}')" """, - ) ).insert() # Create a ToDo custom report with test user diff --git a/frappe/tests/test_client.py b/frappe/tests/test_client.py index 1fb46d1e52..d4c758c5be 100644 --- a/frappe/tests/test_client.py +++ b/frappe/tests/test_client.py @@ -9,7 +9,7 @@ from frappe.utils import get_site_url class TestClient(FrappeTestCase): def test_set_value(self): - todo = frappe.get_doc(dict(doctype="ToDo", description="test")).insert() + todo = frappe.get_doc(doctype="ToDo", description="test").insert() frappe.set_value("ToDo", todo.name, "description", "test 1") self.assertEqual(frappe.get_value("ToDo", todo.name, "description"), "test 1") diff --git a/frappe/tests/test_dashboard_connections.py b/frappe/tests/test_dashboard_connections.py index f0cdc675c6..4d0f892558 100644 --- a/frappe/tests/test_dashboard_connections.py +++ b/frappe/tests/test_dashboard_connections.py @@ -130,9 +130,9 @@ class TestDashboardConnections(FrappeTestCase): todo.run_method("save_customization") # create a test doc - todo_doc = frappe.get_doc(dict(doctype="ToDo", description="test")).insert() - frappe.get_doc(dict(doctype="Test Doctype D", title="d-001", doclink=todo_doc.name)).insert() - frappe.get_doc(dict(doctype="Test Doctype E", title="e-001", todo=todo_doc.name)).insert() + todo_doc = frappe.get_doc(doctype="ToDo", description="test").insert() + frappe.get_doc(doctype="Test Doctype D", title="d-001", doclink=todo_doc.name).insert() + frappe.get_doc(doctype="Test Doctype E", title="e-001", todo=todo_doc.name).insert() connections = get_open_count("ToDo", todo_doc.name)["count"] self.assertEqual(len(connections["external_links_found"]), 2) diff --git a/frappe/tests/test_defaults.py b/frappe/tests/test_defaults.py index a8c8ed2697..9f4024de4d 100644 --- a/frappe/tests/test_defaults.py +++ b/frappe/tests/test_defaults.py @@ -60,12 +60,7 @@ class TestDefaults(FrappeTestCase): frappe.set_user(user) perm_doc = frappe.get_doc( - dict( - doctype="User Permission", - user=frappe.session.user, - allow="Language", - for_value="en-GB", - ) + doctype="User Permission", user=frappe.session.user, allow="Language", for_value="en-GB" ).insert(ignore_permissions=True) self.assertEqual(get_global_default("language"), None) @@ -84,12 +79,7 @@ class TestDefaults(FrappeTestCase): clear_user_default("Country") perm_doc = frappe.get_doc( - dict( - doctype="User Permission", - user=frappe.session.user, - allow="Country", - for_value="India", - ) + doctype="User Permission", user=frappe.session.user, allow="Country", for_value="India" ).insert(ignore_permissions=True) frappe.db.set_value("User Permission", perm_doc.name, "is_default", 1) @@ -101,12 +91,7 @@ class TestDefaults(FrappeTestCase): self.assertEqual(get_user_default("Country"), None) perm_doc = frappe.get_doc( - dict( - doctype="User Permission", - user=frappe.session.user, - allow="Country", - for_value="United States", - ) + doctype="User Permission", user=frappe.session.user, allow="Country", for_value="United States" ).insert(ignore_permissions=True) self.assertEqual(get_user_default("Country"), "United States") diff --git a/frappe/tests/test_document_locks.py b/frappe/tests/test_document_locks.py index 0fde5b5543..e01705187a 100644 --- a/frappe/tests/test_document_locks.py +++ b/frappe/tests/test_document_locks.py @@ -7,7 +7,7 @@ from frappe.utils.data import add_to_date, today class TestDocumentLocks(FrappeTestCase): def test_locking(self): - todo = frappe.get_doc(dict(doctype="ToDo", description="test")).insert() + todo = frappe.get_doc(doctype="ToDo", description="test").insert() todo_1 = frappe.get_doc("ToDo", todo.name) todo.lock() @@ -19,7 +19,7 @@ class TestDocumentLocks(FrappeTestCase): todo_1.unlock() def test_operations_on_locked_documents(self): - todo = frappe.get_doc(dict(doctype="ToDo", description="testing operations")).insert() + todo = frappe.get_doc(doctype="ToDo", description="testing operations").insert() todo.lock() with self.assertRaises(frappe.DocumentLockedError): @@ -39,7 +39,7 @@ class TestDocumentLocks(FrappeTestCase): self.assertEqual(todo.is_locked, False) def test_locks_auto_expiry(self): - todo = frappe.get_doc(dict(doctype="ToDo", description=frappe.generate_hash())).insert() + todo = frappe.get_doc(doctype="ToDo", description=frappe.generate_hash()).insert() todo.lock() self.assertRaises(frappe.DocumentLockedError, todo.lock) diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index cadbb2b35d..f59970acfa 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -39,7 +39,7 @@ class TestGlobalSearch(FrappeTestCase): for text in phrases: frappe.get_doc( - dict(doctype="Event", subject=text, repeat_on="Monthly", starts_on=now_datetime()) + doctype="Event", subject=text, repeat_on="Monthly", starts_on=now_datetime() ).insert() global_search.sync_global_search() diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index a85e9358ea..a697846b33 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -96,12 +96,10 @@ class TestScheduler(TestCase): def get_test_job(method="frappe.tests.test_scheduler.test_timeout_10", frequency="All") -> ScheduledJobType: if not frappe.db.exists("Scheduled Job Type", dict(method=method)): job = frappe.get_doc( - dict( - doctype="Scheduled Job Type", - method=method, - last_execution="2010-01-01 00:00:00", - frequency=frequency, - ) + doctype="Scheduled Job Type", + method=method, + last_execution="2010-01-01 00:00:00", + frequency=frequency, ).insert() else: job = frappe.get_doc("Scheduled Job Type", dict(method=method)) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 7ca2069fc6..c9d87a72c6 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -27,17 +27,13 @@ class TestWebsite(FrappeTestCase): frappe.set_user("Administrator") # test home page via role user = frappe.get_doc( - dict(doctype="User", email="test-user-for-home-page@example.com", first_name="test") + doctype="User", email="test-user-for-home-page@example.com", first_name="test" ).insert(ignore_if_duplicate=True) user.reload() - role = frappe.get_doc( - dict( - doctype="Role", - role_name="home-page-test", - desk_access=0, - ) - ).insert(ignore_if_duplicate=True) + role = frappe.get_doc(doctype="Role", role_name="home-page-test", desk_access=0).insert( + ignore_if_duplicate=True + ) user.add_roles(role.name) user.save() diff --git a/frappe/tests/tests_geo_utils.py b/frappe/tests/tests_geo_utils.py index 3ecf2dd8e5..d30cb92b98 100644 --- a/frappe/tests/tests_geo_utils.py +++ b/frappe/tests/tests_geo_utils.py @@ -9,7 +9,7 @@ from frappe.tests.utils import FrappeTestCase class TestGeoUtils(FrappeTestCase): def setUp(self): self.todo = frappe.get_doc( - dict(doctype="ToDo", description="Test description", assigned_by="Administrator") + doctype="ToDo", description="Test description", assigned_by="Administrator" ).insert() self.test_location_dict = { diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 1a8cf3e87d..a80b28dc44 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -180,18 +180,16 @@ def scrub(text): def make_test_blog(category_title="Test Blog Category"): category_name = scrub(category_title) if not frappe.db.exists("Blog Category", category_name): - frappe.get_doc(dict(doctype="Blog Category", title=category_title)).insert() + frappe.get_doc(doctype="Blog Category", title=category_title).insert() if not frappe.db.exists("Blogger", "test-blogger"): - frappe.get_doc(dict(doctype="Blogger", short_name="test-blogger", full_name="Test Blogger")).insert() + frappe.get_doc(doctype="Blogger", short_name="test-blogger", full_name="Test Blogger").insert() return frappe.get_doc( - dict( - doctype="Blog Post", - blog_category=category_name, - blogger="test-blogger", - title=random_string(20), - route=random_string(20), - content=random_string(20), - published=1, - ) + doctype="Blog Post", + blog_category=category_name, + blogger="test-blogger", + title=random_string(20), + route=random_string(20), + content=random_string(20), + published=1, ).insert() diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index adf2d8495a..61a43e6f8a 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -20,15 +20,13 @@ class TestWebPage(FrappeTestCase): def test_content_type(self): web_page = frappe.get_doc( - dict( - doctype="Web Page", - title="Test Content Type", - published=1, - content_type="Rich Text", - main_section="rich text", - main_section_md="# h1\nmarkdown content", - main_section_html="
html content
", - ) + doctype="Web Page", + title="Test Content Type", + published=1, + content_type="Rich Text", + main_section="rich text", + main_section_md="# h1\nmarkdown content", + main_section_html="
html content
", ).insert() self.assertIn("rich text", get_response_content("/test-content-type")) @@ -45,16 +43,14 @@ class TestWebPage(FrappeTestCase): def test_dynamic_route(self): web_page = frappe.get_doc( - dict( - doctype="Web Page", - title="Test Dynamic Route", - published=1, - dynamic_route=1, - route="/doctype-view/", - content_type="HTML", - dynamic_template=1, - main_section_html="
{{ frappe.form_dict.doctype }}
", - ) + doctype="Web Page", + title="Test Dynamic Route", + published=1, + dynamic_route=1, + route="/doctype-view/", + content_type="HTML", + dynamic_template=1, + main_section_html="
{{ frappe.form_dict.doctype }}
", ).insert() try: from frappe.utils import get_html_for_route diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py index 2ef3cfcf51..d8d30a5934 100644 --- a/frappe/workflow/doctype/workflow/test_workflow.py +++ b/frappe/workflow/doctype/workflow/test_workflow.py @@ -183,7 +183,7 @@ def create_todo_workflow(): TEST_ROLE = "Test Approver" if not frappe.db.exists("Role", TEST_ROLE): - frappe.get_doc(dict(doctype="Role", role_name=TEST_ROLE)).insert(ignore_if_duplicate=True) + frappe.get_doc(doctype="Role", role_name=TEST_ROLE).insert(ignore_if_duplicate=True) if frappe.db.exists("User", UI_TEST_USER): frappe.get_doc("User", UI_TEST_USER).add_roles(TEST_ROLE) @@ -229,4 +229,4 @@ def create_todo_workflow(): def create_new_todo(): - return frappe.get_doc(dict(doctype="ToDo", description="workflow " + random_string(10))).insert() + return frappe.get_doc(doctype="ToDo", description="workflow " + random_string(10)).insert() diff --git a/frappe/www/contact.py b/frappe/www/contact.py index 98aafdef49..4e791ca067 100644 --- a/frappe/www/contact.py +++ b/frappe/www/contact.py @@ -45,12 +45,10 @@ def send_message(sender, message, subject="Website Query"): # add to to-do ? frappe.get_doc( - dict( - doctype="Communication", - sender=sender, - subject=_("New Message from Website Contact Page"), - sent_or_received="Received", - content=message, - status="Open", - ) + doctype="Communication", + sender=sender, + subject=_("New Message from Website Contact Page"), + sent_or_received="Received", + content=message, + status="Open", ).insert(ignore_permissions=True)