refactor(treewide): formatting and ruff fixes, + manually enabled F401
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
diff --git a/erpnext/tests/test_init.py b/erpnext/tests/test_init.py
index 18ce93a..2b4ea9f 100644
--- a/erpnext/tests/test_init.py
+++ b/erpnext/tests/test_init.py
@@ -9,36 +9,35 @@
class TestInit(unittest.TestCase):
def test_encode_company_abbr(self):
-
abbr = "NFECT"
names = [
"Warehouse Name",
"ERPNext Foundation India",
- "Gold - Member - {a}".format(a=abbr),
- " - {a}".format(a=abbr),
+ f"Gold - Member - {abbr}",
+ f" - {abbr}",
"ERPNext - Foundation - India",
- "ERPNext Foundation India - {a}".format(a=abbr),
- "No-Space-{a}".format(a=abbr),
+ f"ERPNext Foundation India - {abbr}",
+ f"No-Space-{abbr}",
"- Warehouse",
]
expected_names = [
- "Warehouse Name - {a}".format(a=abbr),
- "ERPNext Foundation India - {a}".format(a=abbr),
- "Gold - Member - {a}".format(a=abbr),
- " - {a}".format(a=abbr),
- "ERPNext - Foundation - India - {a}".format(a=abbr),
- "ERPNext Foundation India - {a}".format(a=abbr),
- "No-Space-{a} - {a}".format(a=abbr),
- "- Warehouse - {a}".format(a=abbr),
+ f"Warehouse Name - {abbr}",
+ f"ERPNext Foundation India - {abbr}",
+ f"Gold - Member - {abbr}",
+ f" - {abbr}",
+ f"ERPNext - Foundation - India - {abbr}",
+ f"ERPNext Foundation India - {abbr}",
+ f"No-Space-{abbr} - {abbr}",
+ f"- Warehouse - {abbr}",
]
for i in range(len(names)):
enc_name = encode_company_abbr(names[i], abbr=abbr)
self.assertTrue(
enc_name == expected_names[i],
- "{enc} is not same as {exp}".format(enc=enc_name, exp=expected_names[i]),
+ f"{enc_name} is not same as {expected_names[i]}",
)
def test_translation_files(self):
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index b553a7c..7ed8451 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -1,12 +1,12 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
-from typing import Any, Dict, NewType, Optional
+from typing import Any, NewType
import frappe
from frappe.core.doctype.report.report import get_report_module_dotted_path
-ReportFilters = Dict[str, Any]
+ReportFilters = dict[str, Any]
ReportName = NewType("ReportName", str)
@@ -57,8 +57,8 @@
report_name: ReportName,
module: str,
filters: ReportFilters,
- default_filters: Optional[ReportFilters] = None,
- optional_filters: Optional[ReportFilters] = None,
+ default_filters: ReportFilters | None = None,
+ optional_filters: ReportFilters | None = None,
):
"""Util for testing execution of a report with specified filters.
@@ -77,9 +77,7 @@
default_filters = {}
test_filters = []
- report_execute_fn = frappe.get_attr(
- get_report_module_dotted_path(module, report_name) + ".execute"
- )
+ report_execute_fn = frappe.get_attr(get_report_module_dotted_path(module, report_name) + ".execute")
report_filters = frappe._dict(default_filters).copy().update(filters)
test_filters.append(report_filters)