From b7f70b17acf2b8abfca31de9badda9ea5580172b Mon Sep 17 00:00:00 2001 From: Teal Dulcet Date: Fri, 22 Dec 2023 07:13:36 -0800 Subject: [PATCH] Fixed RET504 (unnecessary-assign) --- management/backup.py | 3 +-- management/mailconfig.py | 3 +-- management/status_checks.py | 3 +-- management/utils.py | 3 +-- management/web_update.py | 6 ++---- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/management/backup.py b/management/backup.py index c8b33d2f..0f7674db 100755 --- a/management/backup.py +++ b/management/backup.py @@ -257,8 +257,7 @@ def get_duplicity_env_vars(env): return env def get_target_type(config): - protocol = config["target"].split(":")[0] - return protocol + return config["target"].split(":")[0] def perform_backup(full_backup): env = load_environment() diff --git a/management/mailconfig.py b/management/mailconfig.py index 3971f825..ed06c242 100755 --- a/management/mailconfig.py +++ b/management/mailconfig.py @@ -192,8 +192,7 @@ def get_mail_aliases(env): aliases = { row[0]: row for row in c.fetchall() } # make dict # put in a canonical order: sort by domain, then by email address lexicographically - aliases = [ aliases[address] for address in utils.sort_email_addresses(aliases.keys(), env) ] - return aliases + return [ aliases[address] for address in utils.sort_email_addresses(aliases.keys(), env) ] def get_mail_aliases_ex(env): # Returns a complex data structure of all mail aliases, similar diff --git a/management/status_checks.py b/management/status_checks.py index 7cdfffc6..3964e2df 100755 --- a/management/status_checks.py +++ b/management/status_checks.py @@ -915,8 +915,7 @@ def what_version_is_this(env): # Git may not be installed and Mail-in-a-Box may not have been cloned from github, # so this function may raise all sorts of exceptions. miab_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - tag = shell("check_output", ["/usr/bin/git", "describe", "--always", "--abbrev=0"], env={"GIT_DIR": os.path.join(miab_dir, '.git')}).strip() - return tag + return shell("check_output", ["/usr/bin/git", "describe", "--always", "--abbrev=0"], env={"GIT_DIR": os.path.join(miab_dir, '.git')}).strip() def get_latest_miab_version(): # This pings https://mailinabox.email/setup.sh and extracts the tag named in diff --git a/management/utils.py b/management/utils.py index 0c475d5c..4ee100f1 100644 --- a/management/utils.py +++ b/management/utils.py @@ -81,7 +81,7 @@ def sort_domains(domain_names, env): )) # Now sort the domain names that fall within each zone. - domain_names = sorted(domain_names, + return sorted(domain_names, key = lambda d : ( # First by zone. zone_domains.index(zones[d]), @@ -96,7 +96,6 @@ def sort_domains(domain_names, env): list(reversed(d.split("."))), )) - return domain_names def sort_email_addresses(email_addresses, env): email_addresses = set(email_addresses) diff --git a/management/web_update.py b/management/web_update.py index 14ad1379..08b272e2 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -45,9 +45,8 @@ def get_web_domains(env, include_www_redirects=True, include_auto=True, exclude_ domains.add(env['PRIMARY_HOSTNAME']) # Sort the list so the nginx conf gets written in a stable order. - domains = sort_domains(domains, env) + return sort_domains(domains, env) - return domains def get_domains_with_a_records(env): domains = set() @@ -225,9 +224,8 @@ def make_domain_config(domain, templates, ssl_certificates, env): nginx_conf = nginx_conf.replace("$ROOT", root) nginx_conf = nginx_conf.replace("$SSL_KEY", tls_cert["private-key"]) nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", tls_cert["certificate"]) - nginx_conf = nginx_conf.replace("$REDIRECT_DOMAIN", re.sub(r"^www\.", "", domain)) # for default www redirects to parent domain + return nginx_conf.replace("$REDIRECT_DOMAIN", re.sub(r"^www\.", "", domain)) # for default www redirects to parent domain - return nginx_conf def get_web_root(domain, env, test_exists=True): # Try STORAGE_ROOT/web/domain_name if it exists, but fall back to STORAGE_ROOT/web/default.