From c35476256f85271fb57584eb0a26f4d9def3caf4 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:14:41 +0100 Subject: [PATCH] refactor: simplify conditional logic Command: `sourcery review --fix --enable de-morgan .` --- .../automation/doctype/auto_repeat/auto_repeat.py | 2 +- frappe/commands/site.py | 2 +- frappe/core/doctype/communication/email.py | 3 ++- frappe/core/doctype/data_import/importer.py | 2 +- frappe/core/doctype/doctype/doctype.py | 14 +++++++------- .../doctype/domain_settings/domain_settings.py | 2 +- frappe/core/doctype/dynamic_link/dynamic_link.py | 2 +- frappe/core/doctype/module_def/module_def.py | 2 +- frappe/core/doctype/report/report.py | 3 ++- .../doctype/server_script/server_script_utils.py | 2 +- frappe/database/mariadb/database.py | 2 +- frappe/database/postgres/database.py | 2 +- .../doctype/dashboard_chart/dashboard_chart.py | 2 +- .../dashboard_settings/dashboard_settings.py | 2 +- .../list_view_settings/list_view_settings.py | 2 +- frappe/desk/doctype/tag/tag.py | 2 +- frappe/desk/form/load.py | 2 +- frappe/desk/reportview.py | 2 +- .../doctype/auto_email_report/auto_email_report.py | 2 +- frappe/installer.py | 2 +- .../social_login_key/test_social_login_key.py | 2 +- frappe/model/base_document.py | 2 +- frappe/model/create_new.py | 2 +- frappe/model/db_query.py | 7 ++++--- frappe/model/document.py | 2 +- frappe/model/rename_doc.py | 2 +- frappe/permissions.py | 2 +- .../printing/doctype/print_format/print_format.py | 3 ++- .../print_format_field_template.py | 2 +- frappe/printing/doctype/print_style/print_style.py | 3 ++- frappe/tests/ui_test_helpers.py | 2 +- frappe/translate.py | 2 +- frappe/utils/backups.py | 2 +- frappe/utils/data.py | 5 +++-- frappe/utils/install.py | 2 +- frappe/website/doctype/web_page/web_page.py | 6 +++--- .../website/doctype/web_template/web_template.py | 2 +- .../website/doctype/website_theme/website_theme.py | 3 ++- frappe/website/router.py | 4 ++-- frappe/workflow/doctype/workflow/workflow.py | 2 +- frappe/www/printview.py | 2 +- frappe/www/qrcode.py | 2 +- 42 files changed, 61 insertions(+), 54 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index c36c009adf..5b7aa7818e 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -150,7 +150,7 @@ class AutoRepeat(Document): def validate_auto_repeat_days(self): auto_repeat_days = self.get_auto_repeat_days() - if not len(set(auto_repeat_days)) == len(auto_repeat_days): + if len(set(auto_repeat_days)) != len(auto_repeat_days): repeated_days = get_repeated(auto_repeat_days) plural = "s" if len(repeated_days) > 1 else "" diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 65f896eb24..9225f31ccb 100644 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -1289,7 +1289,7 @@ def trim_database(context, dry_run, format, no_backup, yes=False): for table_name in database_tables: if not table_name.startswith("tab"): continue - if not (table_name.replace("tab", "", 1) in doctype_tables or table_name in STANDARD_TABLES): + if table_name.replace("tab", "", 1) not in doctype_tables and table_name not in STANDARD_TABLES: TABLES_TO_DROP.append(table_name) if not TABLES_TO_DROP: diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index a0c9d35f20..50853f6bec 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -191,7 +191,8 @@ def _make( def validate_email(doc: "Communication") -> None: """Validate Email Addresses of Recipients and CC""" if ( - not (doc.communication_type == "Communication" and doc.communication_medium == "Email") + doc.communication_type != "Communication" + or doc.communication_medium != "Email" or doc.flags.in_receive ): return diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index fbbf12a978..632a7b7e1d 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -179,7 +179,7 @@ class Importer: log_index += 1 - if not self.data_import.status == "Partial Success": + if self.data_import.status != "Partial Success": self.data_import.db_set("status", "Partial Success") # commit after every successful import diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index ff948e90ff..83b5395a4e 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -292,7 +292,7 @@ class DocType(Document): if not [d.fieldname for d in self.fields if d.in_list_view]: cnt = 0 for d in self.fields: - if d.reqd and not d.hidden and not d.fieldtype in not_allowed_in_list_view: + if d.reqd and not d.hidden and d.fieldtype not in not_allowed_in_list_view: d.in_list_view = 1 cnt += 1 if cnt == 4: @@ -307,7 +307,7 @@ class DocType(Document): def check_indexing_for_dashboard_links(self): """Enable indexing for outgoing links used in dashboard""" for d in self.fields: - if d.fieldtype == "Link" and not (d.unique or d.search_index): + if d.fieldtype == "Link" and not d.unique and not d.search_index: referred_as_link = frappe.db.exists( "DocType Link", {"parent": d.options, "link_doctype": self.name, "link_fieldname": d.fieldname}, @@ -414,7 +414,7 @@ class DocType(Document): if self.has_web_view: # route field must be present - if not "route" in [d.fieldname for d in self.fields]: + if "route" not in [d.fieldname for d in self.fields]: frappe.throw(_('Field "route" is mandatory for Web Views'), title="Missing Field") # clear website cache @@ -1267,7 +1267,7 @@ def validate_fields(meta): ), WrongOptionsDoctypeLinkError, ) - elif not (options == d.options): + elif options != d.options: frappe.throw( _("{0}: Options {1} must be the same as doctype name {2} for the field {3}").format( docname, d.options, options, d.label @@ -1515,7 +1515,7 @@ def validate_fields(meta): def check_table_multiselect_option(docfield): """check if the doctype provided in Option has atleast 1 Link field""" - if not docfield.fieldtype == "Table MultiSelect": + if docfield.fieldtype != "Table MultiSelect": return doctype = docfield.options @@ -1581,7 +1581,7 @@ def validate_fields(meta): title=_("Invalid Option"), ) - if not (meta.is_virtual == child_doctype_meta.is_virtual): + if meta.is_virtual != child_doctype_meta.is_virtual: error_msg = " should be virtual." if meta.is_virtual else " cannot be virtual." frappe.throw( _("Child Table {0} for field {1}" + error_msg).format( @@ -1893,7 +1893,7 @@ def check_email_append_to(doc): if doc.sender_field and not sender_field: frappe.throw(_("Select a valid Sender Field for creating documents from Email")) - if not sender_field.options == "Email": + if sender_field.options != "Email": frappe.throw(_("Sender Field should have Email in options")) diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index 4a1a63329b..d56475f2cd 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -21,7 +21,7 @@ class DomainSettings(Document): active_domains = [d.domain for d in self.active_domains] added = False for d in domains: - if not d in active_domains: + if d not in active_domains: self.append("active_domains", dict(domain=d)) added = True diff --git a/frappe/core/doctype/dynamic_link/dynamic_link.py b/frappe/core/doctype/dynamic_link/dynamic_link.py index 0ff01eb438..faf78cb425 100644 --- a/frappe/core/doctype/dynamic_link/dynamic_link.py +++ b/frappe/core/doctype/dynamic_link/dynamic_link.py @@ -32,7 +32,7 @@ def deduplicate_dynamic_links(doc): links, duplicate = [], False for l in doc.links or []: t = (l.link_doctype, l.link_name) - if not t in links: + if t not in links: links.append(t) else: duplicate = True diff --git a/frappe/core/doctype/module_def/module_def.py b/frappe/core/doctype/module_def/module_def.py index 28f7b4f11a..6cb407adbb 100644 --- a/frappe/core/doctype/module_def/module_def.py +++ b/frappe/core/doctype/module_def/module_def.py @@ -47,7 +47,7 @@ class ModuleDef(Document): if not frappe.local.module_app.get(frappe.scrub(self.name)): with open(frappe.get_app_path(self.app_name, "modules.txt")) as f: content = f.read() - if not self.name in content.splitlines(): + if self.name not in content.splitlines(): modules = list(filter(None, content.splitlines())) modules.append(self.name) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 2d78892f14..f43bc65f6b 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -87,7 +87,8 @@ class Report(Document): if ( self.is_standard == "Yes" and not cint(getattr(frappe.local.conf, "developer_mode", 0)) - and not (frappe.flags.in_migrate or frappe.flags.in_patch) + and not frappe.flags.in_migrate + and not frappe.flags.in_patch ): frappe.throw(_("You are not allowed to delete Standard Report")) delete_custom_role("report", self.name) diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py index 6ba65e7353..d0ae253d29 100644 --- a/frappe/core/doctype/server_script/server_script_utils.py +++ b/frappe/core/doctype/server_script/server_script_utils.py @@ -23,7 +23,7 @@ EVENT_MAP = { def run_server_script_for_doc_event(doc, event): # run document event method - if not event in EVENT_MAP: + if event not in EVENT_MAP: return if frappe.flags.in_install: diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py index 1f087a243a..1d2fc09120 100644 --- a/frappe/database/mariadb/database.py +++ b/frappe/database/mariadb/database.py @@ -281,7 +281,7 @@ class MariaDBDatabase(MariaDBConnectionUtil, MariaDBExceptionUtil, Database): ) def create_global_search_table(self): - if not "__global_search" in self.get_tables(): + if "__global_search" not in self.get_tables(): self.sql( """create table __global_search( doctype varchar(100), diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py index 37fc9601f2..56a1b8733f 100644 --- a/frappe/database/postgres/database.py +++ b/frappe/database/postgres/database.py @@ -288,7 +288,7 @@ class PostgresDatabase(PostgresExceptionUtil, Database): ) def create_global_search_table(self): - if not "__global_search" in self.get_tables(): + if "__global_search" not in self.get_tables(): self.sql( """create table "__global_search"( doctype varchar(100), diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 059624d28f..2385860115 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -317,7 +317,7 @@ def get_result(data, timegrain, from_date, to_date, chart_type): d[1] += data[data_index][1] count += data[data_index][2] data_index += 1 - if chart_type == "Average" and not count == 0: + if chart_type == "Average" and count != 0: d[1] = d[1] / count if chart_type == "Count": d[1] = count diff --git a/frappe/desk/doctype/dashboard_settings/dashboard_settings.py b/frappe/desk/doctype/dashboard_settings/dashboard_settings.py index 387c73f954..b88745a757 100644 --- a/frappe/desk/doctype/dashboard_settings/dashboard_settings.py +++ b/frappe/desk/doctype/dashboard_settings/dashboard_settings.py @@ -51,7 +51,7 @@ def save_chart_config(reset, config, chart_name): chart_config[chart_name] = {} else: config = frappe.parse_json(config) - if not chart_name in chart_config: + if chart_name not in chart_config: chart_config[chart_name] = {} chart_config[chart_name].update(config) diff --git a/frappe/desk/doctype/list_view_settings/list_view_settings.py b/frappe/desk/doctype/list_view_settings/list_view_settings.py index 4c1bee8d20..70ee6db623 100644 --- a/frappe/desk/doctype/list_view_settings/list_view_settings.py +++ b/frappe/desk/doctype/list_view_settings/list_view_settings.py @@ -96,7 +96,7 @@ def get_default_listview_fields(doctype): fields = [f.get("fieldname") for f in doctype_json.get("fields") if f.get("in_list_view")] if meta.title_field: - if not meta.title_field.strip() in fields: + if meta.title_field.strip() not in fields: fields.append(meta.title_field.strip()) return fields diff --git a/frappe/desk/doctype/tag/tag.py b/frappe/desk/doctype/tag/tag.py index 8ee18fa74b..65ddf5cde4 100644 --- a/frappe/desk/doctype/tag/tag.py +++ b/frappe/desk/doctype/tag/tag.py @@ -87,7 +87,7 @@ class DocTags: def add(self, dn, tag): """add a new user tag""" tl = self.get_tags(dn).split(",") - if not tag in tl: + if tag not in tl: tl.append(tag) if not frappe.db.exists("Tag", tag): frappe.get_doc({"doctype": "Tag", "name": tag}).insert(ignore_permissions=True) diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 77767f589c..993899f4bf 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -437,7 +437,7 @@ def get_title_values_for_link_and_dynamic_link_fields(doc, link_fields=None): doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) meta = frappe.get_meta(doctype) - if not meta or not (meta.title_field and meta.show_title_field_in_link): + if not meta or not meta.title_field or not meta.show_title_field_in_link: continue link_title = frappe.db.get_value( diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 8f2f7f8dca..b8c84da573 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -584,7 +584,7 @@ def get_filter_dashboard_data(stats, doctype, filters=None): columns = frappe.db.get_table_columns(doctype) for tag in tags: - if not tag["name"] in columns: + if tag["name"] not in columns: continue tagcount = [] if tag["type"] not in ["Date", "Datetime"]: diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 38e627539d..bbede90a34 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -235,7 +235,7 @@ class AutoEmailReport(Document): else: message = self.get_html_table() - if not self.format == "HTML": + if self.format != "HTML": attachments = [{"fname": self.get_file_name(), "fcontent": data}] frappe.sendmail( diff --git a/frappe/installer.py b/frappe/installer.py index 89b52e1d4e..c271608833 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -58,7 +58,7 @@ def _new_site( print(f"Site {site} already exists") sys.exit(1) - if no_mariadb_socket and not db_type == "mariadb": + if no_mariadb_socket and db_type != "mariadb": print("--no-mariadb-socket requires db_type to be set to mariadb.") sys.exit(1) diff --git a/frappe/integrations/doctype/social_login_key/test_social_login_key.py b/frappe/integrations/doctype/social_login_key/test_social_login_key.py index 961cd41b65..2a32ab8aa1 100644 --- a/frappe/integrations/doctype/social_login_key/test_social_login_key.py +++ b/frappe/integrations/doctype/social_login_key/test_social_login_key.py @@ -90,7 +90,7 @@ class TestSocialLoginKey(FrappeTestCase): def make_social_login_key(**kwargs): kwargs["doctype"] = "Social Login Key" - if not "provider_name" in kwargs: + if "provider_name" not in kwargs: kwargs["provider_name"] = "Test OAuth2 Provider" return frappe.get_doc(kwargs) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 42c575371e..640de01216 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -850,7 +850,7 @@ class BaseDocument: return for df in self.meta.get_select_fields(): - if df.fieldname == "naming_series" or not (self.get(df.fieldname) and df.options): + if df.fieldname == "naming_series" or not self.get(df.fieldname) or not df.options: continue options = (df.options or "").split("\n") diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py index f8b7a73a3b..d836fa481d 100644 --- a/frappe/model/create_new.py +++ b/frappe/model/create_new.py @@ -67,7 +67,7 @@ def set_user_and_static_default_values(doc): ) if user_default_value is not None: # if fieldtype is link check if doc exists - if not df.fieldtype == "Link" or frappe.db.exists(df.options, user_default_value): + if df.fieldtype != "Link" or frappe.db.exists(df.options, user_default_value): doc.set(df.fieldname, user_default_value) else: diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 76a03f5a76..ee489da65f 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -465,7 +465,7 @@ class DatabaseQuery: # add tables from fields if self.fields: for field in self.fields: - if not ("tab" in field and "." in field) or any(x for x in sql_functions if x in field): + if "tab" not in field or "." not in field or any(x for x in sql_functions if x in field): continue table_name = field.split(".", 1)[0] @@ -478,7 +478,7 @@ class DatabaseQuery: if table_name.lower().startswith("group_concat("): table_name = table_name[13:] - if not table_name[0] == "`": + if table_name[0] != "`": table_name = f"`{table_name}`" if ( table_name not in self.query_tables and table_name not in self.linked_table_aliases.values() @@ -927,7 +927,8 @@ class DatabaseQuery: role_permissions = frappe.permissions.get_role_permissions(self.doctype_meta, user=self.user) if ( not self.doctype_meta.istable - and not (role_permissions.get("select") or role_permissions.get("read")) + and not role_permissions.get("select") + and not role_permissions.get("read") and not self.flags.ignore_permissions and not has_any_user_permission_for_doctype(self.doctype, self.user, self.reference_doctype) ): diff --git a/frappe/model/document.py b/frappe/model/document.py index 9ed4e2a3f2..8eb45e8827 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -620,7 +620,7 @@ class Document(BaseDocument): workflow = self.meta.get_workflow() if workflow: validate_workflow(self) - if not self._action == "save": + if self._action != "save": set_workflow_state_on_action(self, workflow, self._action) def validate_set_only_once(self): diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 9bad8f1028..b4d30a5943 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -384,7 +384,7 @@ def validate_rename( ): frappe.throw(_("You need write permission to rename")) - if not (force or ignore_permissions) and not meta.allow_rename: + if not force and not ignore_permissions and not meta.allow_rename: frappe.throw(_("{0} not allowed to be renamed").format(_(doctype))) # validate naming like it's done in doc.py diff --git a/frappe/permissions.py b/frappe/permissions.py index 1f0d182b07..db1906dada 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -405,7 +405,7 @@ def get_valid_perms(doctype=None, user=None): doctypes_with_custom_perms = get_doctypes_with_custom_docperms() for p in perms: - if not p.parent in doctypes_with_custom_perms: + if p.parent not in doctypes_with_custom_perms: custom_perms.append(p) if doctype: diff --git a/frappe/printing/doctype/print_format/print_format.py b/frappe/printing/doctype/print_format/print_format.py index eda084968a..426a2cd1a7 100644 --- a/frappe/printing/doctype/print_format/print_format.py +++ b/frappe/printing/doctype/print_format/print_format.py @@ -66,7 +66,8 @@ class PrintFormat(Document): if ( self.standard == "Yes" and not frappe.local.conf.get("developer_mode") - and not (frappe.flags.in_migrate or frappe.flags.in_test) + and not frappe.flags.in_migrate + and not frappe.flags.in_test ): frappe.throw(frappe._("Standard Print Format cannot be updated")) diff --git a/frappe/printing/doctype/print_format_field_template/print_format_field_template.py b/frappe/printing/doctype/print_format_field_template/print_format_field_template.py index e83850a8c4..4f3f5d53b8 100644 --- a/frappe/printing/doctype/print_format_field_template/print_format_field_template.py +++ b/frappe/printing/doctype/print_format_field_template/print_format_field_template.py @@ -23,7 +23,7 @@ class PrintFormatFieldTemplate(Document): template_file: DF.Data | None # end: auto-generated types def validate(self): - if self.standard and not (frappe.conf.developer_mode or frappe.flags.in_patch): + if self.standard and not frappe.conf.developer_mode and not frappe.flags.in_patch: frappe.throw(_("Enable developer mode to create a standard Print Template")) def before_insert(self): diff --git a/frappe/printing/doctype/print_style/print_style.py b/frappe/printing/doctype/print_style/print_style.py index e3141e7472..c1ca66242c 100644 --- a/frappe/printing/doctype/print_style/print_style.py +++ b/frappe/printing/doctype/print_style/print_style.py @@ -24,7 +24,8 @@ class PrintStyle(Document): if ( self.standard == 1 and not frappe.local.conf.get("developer_mode") - and not (frappe.flags.in_import or frappe.flags.in_test) + and not frappe.flags.in_import + and not frappe.flags.in_test ): frappe.throw(frappe._("Standard Print Style cannot be changed. Please duplicate to edit.")) diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 62eef10a02..9304da9a1d 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -7,7 +7,7 @@ UI_TEST_USER = "frappe@example.com" def whitelist_for_tests(fn): - if frappe.request and not (frappe.flags.in_test or getattr(frappe.local, "dev_server", 0)): + if frappe.request and not frappe.flags.in_test and not getattr(frappe.local, "dev_server", 0): frappe.throw("Cannot run UI tests. Use a development server with `bench start`") return frappe.whitelist()(fn) diff --git a/frappe/translate.py b/frappe/translate.py index 2f3341fd35..0f023c1f91 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -350,7 +350,7 @@ def get_messages_from_doctype(name): if d.fieldtype == "Select" and d.options: options = d.options.split("\n") - if not "icon" in options[0]: + if "icon" not in options[0]: messages.extend(options) if d.fieldtype == "HTML" and d.options: messages.append(d.options) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index eebccae5f6..194b477e1a 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -136,7 +136,7 @@ class BackupGenerator: self.backup_includes = passed_tables["include"] self.backup_excludes = passed_tables["exclude"] - if not (self.backup_includes or self.backup_excludes) and not self.ignore_conf: + if not self.backup_includes and not self.backup_excludes and not self.ignore_conf: self.backup_includes = self.backup_includes or conf_tables["include"] self.backup_excludes = self.backup_excludes or conf_tables["exclude"] diff --git a/frappe/utils/data.py b/frappe/utils/data.py index f3cf219603..58a161b8e6 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1596,7 +1596,7 @@ def get_url(uri: str | None = None, full_address: bool = False) -> str: if not host_name: host_name = "http://127.0.0.1" - if host_name and not (host_name.startswith("http://") or host_name.startswith("https://")): + if host_name and not host_name.startswith("http://") and not host_name.startswith("https://"): host_name = "http://" + host_name if not uri and full_address: @@ -1605,7 +1605,8 @@ def get_url(uri: str | None = None, full_address: bool = False) -> str: port = frappe.conf.http_port or frappe.conf.webserver_port if ( - not (frappe.conf.restart_supervisor_on_update or frappe.conf.restart_systemd_on_update) + not frappe.conf.restart_supervisor_on_update + and not frappe.conf.restart_systemd_on_update and host_name and not url_contains_port(host_name) and port diff --git a/frappe/utils/install.py b/frappe/utils/install.py index 7b45e70d3c..0ccc34f152 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -145,7 +145,7 @@ def get_admin_password(): def ask_admin_password(): admin_password = getpass.getpass("Set Administrator password: ") admin_password2 = getpass.getpass("Re-enter Administrator password: ") - if not admin_password == admin_password2: + if admin_password != admin_password2: print("\nPasswords do not match") return ask_admin_password() return admin_password diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 3c2d6a2ad0..5bcc237e60 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -125,7 +125,7 @@ class WebPage(WebsiteGenerator): frappe.flags.web_block_styles = {} try: context["main_section"] = render_template(context.main_section, context) - if not "" in context.main_section: + if "" not in context.main_section: context["no_cache"] = 1 except TemplateSyntaxError: raise @@ -137,13 +137,13 @@ class WebPage(WebsiteGenerator): """Build breadcrumbs template""" if self.breadcrumbs: context.parents = frappe.safe_eval(self.breadcrumbs, {"_": _}) - if not "no_breadcrumbs" in context: + if "no_breadcrumbs" not in context: if "" in context.main_section: context.no_breadcrumbs = 1 def set_title_and_header(self, context): """Extract and set title and header from content or context.""" - if not "no_header" in context: + if "no_header" not in context: if "" in context.main_section: context.no_header = 1 diff --git a/frappe/website/doctype/web_template/web_template.py b/frappe/website/doctype/web_template/web_template.py index 34e0015037..3a43c6037e 100644 --- a/frappe/website/doctype/web_template/web_template.py +++ b/frappe/website/doctype/web_template/web_template.py @@ -28,7 +28,7 @@ class WebTemplate(Document): type: DF.Literal["Component", "Section", "Navbar", "Footer"] # end: auto-generated types def validate(self): - if self.standard and not (frappe.conf.developer_mode or frappe.flags.in_patch): + if self.standard and not frappe.conf.developer_mode and not frappe.flags.in_patch: frappe.throw(_("Enable developer mode to create a standard Web Template")) for field in self.fields: diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 659f8a0648..db9f420c18 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -53,7 +53,8 @@ class WebsiteTheme(Document): if ( not self.custom and frappe.local.conf.get("developer_mode") - and not (frappe.flags.in_import or frappe.flags.in_test) + and not frappe.flags.in_import + and not frappe.flags.in_test ): self.export_doc() diff --git a/frappe/website/router.py b/frappe/website/router.py index cae5d3f50f..3085212aa1 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -109,12 +109,12 @@ def get_pages_from_path(start, app, app_path): if os.path.exists(start_path): for basepath, folders, files in os.walk(start_path): # add missing __init__.py - if not "__init__.py" in files and frappe.conf.get("developer_mode"): + if "__init__.py" not in files and frappe.conf.get("developer_mode"): open(os.path.join(basepath, "__init__.py"), "a").close() for fname in files: fname = frappe.utils.cstr(fname) - if not "." in fname: + if "." not in fname: continue page_name, extn = fname.rsplit(".", 1) if extn in ("js", "css") and os.path.exists(os.path.join(basepath, page_name + ".html")): diff --git a/frappe/workflow/doctype/workflow/workflow.py b/frappe/workflow/doctype/workflow/workflow.py index a8c59748b1..16c440e99b 100644 --- a/frappe/workflow/doctype/workflow/workflow.py +++ b/frappe/workflow/doctype/workflow/workflow.py @@ -104,7 +104,7 @@ class Workflow(Document): for key in new_states: if key in before_save_states: - if not new_states[key].doc_status == before_save_states[key].doc_status: + if new_states[key].doc_status != before_save_states[key].doc_status: frappe.db.set_value( self.document_type, {self.workflow_state_field: before_save_states[key].state}, diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 538893d818..7d7798864d 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -244,7 +244,7 @@ def set_title_values_for_link_and_dynamic_link_fields(meta, doc, parent_doc=None doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) meta = frappe.get_meta(doctype) - if not meta or not (meta.title_field and meta.show_title_field_in_link): + if not meta or not meta.title_field or not meta.show_title_field_in_link: continue link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) diff --git a/frappe/www/qrcode.py b/frappe/www/qrcode.py index e6d683694f..39156ce797 100644 --- a/frappe/www/qrcode.py +++ b/frappe/www/qrcode.py @@ -18,7 +18,7 @@ def get_query_key(): query_string = frappe.local.request.query_string query = dict(parse_qsl(query_string)) query = {key.decode(): val.decode() for key, val in query.items()} - if not "k" in list(query): + if "k" not in list(query): frappe.throw(_("Not Permitted"), frappe.PermissionError) query = (query["k"]).strip() if False in [i.isalpha() or i.isdigit() for i in query]: