Skip to content

Commit 6e6fc07

Browse files
jsf9kjsf9k
committed
Prefer f-strings
This gets rid of some errors from the pyupgrade pre-commit hook.
1 parent 88112b1 commit 6e6fc07

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/trustymail/trustymail.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def starttls_scan(domain, smtp_timeout, smtp_localhost, smtp_ports, smtp_cache):
219219
smtp_connection.connect(mail_server_ip_address, port)
220220
domain.starttls_results[server_and_port]["is_listening"] = True
221221
except (
222-
socket.timeout,
222+
TimeoutError,
223223
smtplib.SMTPConnectError,
224224
smtplib.SMTPServerDisconnected,
225225
ConnectionRefusedError,
@@ -343,14 +343,14 @@ def check_spf_record(record_text, domain, strict=2):
343343
handle_error(
344344
"[SPF]",
345345
domain,
346-
"SPF query returned {}: {}".format(response_type, response[2]),
346+
f"SPF query returned {response_type}: {response[2]}",
347347
)
348348
elif response_type == "ambiguous":
349349
# Log the ambiguity so it appears in the results CSV
350350
handle_error(
351351
"[SPF]",
352352
domain,
353-
"SPF query returned {}: {}".format(response_type, response[2]),
353+
f"SPF query returned {response_type}: {response[2]}",
354354
)
355355

356356
# Now rerun the check with less strictness to get an
@@ -540,7 +540,7 @@ def dmarc_scan(resolver, domain):
540540
"subdomain record does not actually exist, and the request for TXT records was "
541541
"redirected to the base domain"
542542
)
543-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
543+
handle_syntax_error("[DMARC]", domain, f"{msg}")
544544
domain.valid_dmarc = False
545545

546546
# Remove excess whitespace
@@ -569,7 +569,7 @@ def dmarc_scan(resolver, domain):
569569
)
570570
if "p" not in tag_dict:
571571
msg = "Record missing required policy (p) tag"
572-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
572+
handle_syntax_error("[DMARC]", domain, f"{msg}")
573573
domain.valid_dmarc = False
574574
elif "sp" not in tag_dict:
575575
tag_dict["sp"] = tag_dict["p"]
@@ -605,39 +605,39 @@ def dmarc_scan(resolver, domain):
605605
"rua",
606606
"ruf",
607607
]:
608-
msg = "Unknown DMARC tag {}".format(tag)
609-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
608+
msg = f"Unknown DMARC tag {tag}"
609+
handle_syntax_error("[DMARC]", domain, f"{msg}")
610610
domain.valid_dmarc = False
611611
elif tag == "p":
612612
if tag_dict[tag] not in ["none", "quarantine", "reject"]:
613-
msg = "Unknown DMARC policy {}".format(tag)
614-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
613+
msg = f"Unknown DMARC policy {tag}"
614+
handle_syntax_error("[DMARC]", domain, f"{msg}")
615615
domain.valid_dmarc = False
616616
else:
617617
domain.dmarc_policy = tag_dict[tag]
618618
elif tag == "sp":
619619
if tag_dict[tag] not in ["none", "quarantine", "reject"]:
620-
msg = "Unknown DMARC subdomain policy {}".format(tag_dict[tag])
621-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
620+
msg = f"Unknown DMARC subdomain policy {tag_dict[tag]}"
621+
handle_syntax_error("[DMARC]", domain, f"{msg}")
622622
domain.valid_dmarc = False
623623
else:
624624
domain.dmarc_subdomain_policy = tag_dict[tag]
625625
elif tag == "fo":
626626
values = tag_dict[tag].split(":")
627627
if "0" in values and "1" in values:
628628
msg = "fo tag values 0 and 1 are mutually exclusive"
629-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
629+
handle_syntax_error("[DMARC]", domain, f"{msg}")
630630
for value in values:
631631
if value not in ["0", "1", "d", "s"]:
632-
msg = "Unknown DMARC fo tag value {}".format(value)
633-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
632+
msg = f"Unknown DMARC fo tag value {value}"
633+
handle_syntax_error("[DMARC]", domain, f"{msg}")
634634
domain.valid_dmarc = False
635635
elif tag == "rf":
636636
values = tag_dict[tag].split(":")
637637
for value in values:
638638
if value not in ["afrf"]:
639-
msg = "Unknown DMARC rf tag value {}".format(value)
640-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
639+
msg = f"Unknown DMARC rf tag value {value}"
640+
handle_syntax_error("[DMARC]", domain, f"{msg}")
641641
domain.valid_dmarc = False
642642
elif tag == "ri":
643643
try:
@@ -646,7 +646,7 @@ def dmarc_scan(resolver, domain):
646646
msg = "Invalid DMARC ri tag value: {} - must be an integer".format(
647647
tag_dict[tag]
648648
)
649-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
649+
handle_syntax_error("[DMARC]", domain, f"{msg}")
650650
domain.valid_dmarc = False
651651
elif tag == "pct":
652652
try:
@@ -656,7 +656,7 @@ def dmarc_scan(resolver, domain):
656656
"Error: invalid DMARC pct tag value: {} - must be an integer between "
657657
"0 and 100".format(tag_dict[tag])
658658
)
659-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
659+
handle_syntax_error("[DMARC]", domain, f"{msg}")
660660
domain.valid_dmarc = False
661661
domain.dmarc_pct = pct
662662
if pct < 100:
@@ -669,7 +669,7 @@ def dmarc_scan(resolver, domain):
669669
msg = "invalid DMARC pct tag value: {} - must be an integer".format(
670670
tag_dict[tag]
671671
)
672-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
672+
handle_syntax_error("[DMARC]", domain, f"{msg}")
673673
domain.valid_dmarc = False
674674
elif tag == "rua" or tag == "ruf":
675675
uris = tag_dict[tag].split(",")
@@ -686,8 +686,8 @@ def dmarc_scan(resolver, domain):
686686
# mailto: is currently the only type of DMARC URI
687687
parsed_uri = parse_dmarc_report_uri(uri)
688688
if parsed_uri is None:
689-
msg = "Error: {} is an invalid DMARC URI".format(uri)
690-
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
689+
msg = f"Error: {uri} is an invalid DMARC URI"
690+
handle_syntax_error("[DMARC]", domain, f"{msg}")
691691
domain.valid_dmarc = False
692692
else:
693693
if tag == "rua":
@@ -720,7 +720,7 @@ def dmarc_scan(resolver, domain):
720720
handle_error(
721721
"[DMARC]",
722722
domain,
723-
"{}".format(error_message),
723+
f"{error_message}",
724724
)
725725
domain.dmarc_reports_address_error = True
726726
domain.valid_dmarc = False
@@ -731,7 +731,7 @@ def dmarc_scan(resolver, domain):
731731
dns.exception.Timeout,
732732
):
733733
handle_syntax_error(
734-
"[DMARC]", domain, "{}".format(error_message)
734+
"[DMARC]", domain, f"{error_message}"
735735
)
736736
domain.dmarc_reports_address_error = True
737737
domain.valid_dmarc = False
@@ -859,7 +859,7 @@ def scan(
859859
dns_hostnames,
860860
)
861861

862-
logging.debug("[{}]".format(domain_name.lower()))
862+
logging.debug(f"[{domain_name.lower()}]")
863863

864864
if scan_types["mx"] and domain.is_live:
865865
mx_scan(resolver, domain)

0 commit comments

Comments
 (0)