Skip to content

Commit d183f73

Browse files
mcdonnnjmcdonnnj
committed
Apply changes from the pyupgrade hook
Add the changes made from running the `pyupgrade` pre-commit hook against the project.
1 parent 11a48bc commit d183f73

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎src/trustymail/trustymail.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ def dmarc_scan(resolver, domain):
530530
"subdomain record does not actually exist, and the request for TXT records was "
531531
"redirected to the base domain"
532532
)
533-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
533+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
534534
domain.valid_dmarc = False
535535

536536
# Remove excess whitespace
@@ -559,7 +559,7 @@ def dmarc_scan(resolver, domain):
559559
)
560560
if "p" not in tag_dict:
561561
msg = "Record missing required policy (p) tag"
562-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
562+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
563563
domain.valid_dmarc = False
564564
elif "sp" not in tag_dict:
565565
tag_dict["sp"] = tag_dict["p"]
@@ -595,58 +595,58 @@ def dmarc_scan(resolver, domain):
595595
"rua",
596596
"ruf",
597597
]:
598-
msg = "Unknown DMARC tag {0}".format(tag)
599-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
598+
msg = "Unknown DMARC tag {}".format(tag)
599+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
600600
domain.valid_dmarc = False
601601
elif tag == "p":
602602
if tag_dict[tag] not in ["none", "quarantine", "reject"]:
603-
msg = "Unknown DMARC policy {0}".format(tag)
604-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
603+
msg = "Unknown DMARC policy {}".format(tag)
604+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
605605
domain.valid_dmarc = False
606606
else:
607607
domain.dmarc_policy = tag_dict[tag]
608608
elif tag == "sp":
609609
if tag_dict[tag] not in ["none", "quarantine", "reject"]:
610-
msg = "Unknown DMARC subdomain policy {0}".format(tag_dict[tag])
611-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
610+
msg = "Unknown DMARC subdomain policy {}".format(tag_dict[tag])
611+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
612612
domain.valid_dmarc = False
613613
else:
614614
domain.dmarc_subdomain_policy = tag_dict[tag]
615615
elif tag == "fo":
616616
values = tag_dict[tag].split(":")
617617
if "0" in values and "1" in values:
618618
msg = "fo tag values 0 and 1 are mutually exclusive"
619-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
619+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
620620
for value in values:
621621
if value not in ["0", "1", "d", "s"]:
622-
msg = "Unknown DMARC fo tag value {0}".format(value)
623-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
622+
msg = "Unknown DMARC fo tag value {}".format(value)
623+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
624624
domain.valid_dmarc = False
625625
elif tag == "rf":
626626
values = tag_dict[tag].split(":")
627627
for value in values:
628628
if value not in ["afrf"]:
629-
msg = "Unknown DMARC rf tag value {0}".format(value)
630-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
629+
msg = "Unknown DMARC rf tag value {}".format(value)
630+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
631631
domain.valid_dmarc = False
632632
elif tag == "ri":
633633
try:
634634
int(tag_dict[tag])
635635
except ValueError:
636-
msg = "Invalid DMARC ri tag value: {0} - must be an integer".format(
636+
msg = "Invalid DMARC ri tag value: {} - must be an integer".format(
637637
tag_dict[tag]
638638
)
639-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
639+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
640640
domain.valid_dmarc = False
641641
elif tag == "pct":
642642
try:
643643
pct = int(tag_dict[tag])
644644
if pct < 0 or pct > 100:
645645
msg = (
646-
"Error: invalid DMARC pct tag value: {0} - must be an integer between "
646+
"Error: invalid DMARC pct tag value: {} - must be an integer between "
647647
"0 and 100".format(tag_dict[tag])
648648
)
649-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
649+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
650650
domain.valid_dmarc = False
651651
domain.dmarc_pct = pct
652652
if pct < 100:
@@ -656,10 +656,10 @@ def dmarc_scan(resolver, domain):
656656
"Warning: The DMARC pct tag value may be less than 100 (the implicit default) during deployment, but should be removed or set to 100 upon full deployment",
657657
)
658658
except ValueError:
659-
msg = "invalid DMARC pct tag value: {0} - must be an integer".format(
659+
msg = "invalid DMARC pct tag value: {} - must be an integer".format(
660660
tag_dict[tag]
661661
)
662-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
662+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
663663
domain.valid_dmarc = False
664664
elif tag == "rua" or tag == "ruf":
665665
uris = tag_dict[tag].split(",")
@@ -676,8 +676,8 @@ def dmarc_scan(resolver, domain):
676676
# mailto: is currently the only type of DMARC URI
677677
parsed_uri = parse_dmarc_report_uri(uri)
678678
if parsed_uri is None:
679-
msg = "Error: {0} is an invalid DMARC URI".format(uri)
680-
handle_syntax_error("[DMARC]", domain, "{0}".format(msg))
679+
msg = "Error: {} is an invalid DMARC URI".format(uri)
680+
handle_syntax_error("[DMARC]", domain, "{}".format(msg))
681681
domain.valid_dmarc = False
682682
else:
683683
if tag == "rua":
@@ -690,11 +690,11 @@ def dmarc_scan(resolver, domain):
690690
get_public_suffix(email_domain).lower()
691691
!= domain.base_domain_name.lower()
692692
):
693-
target = "{0}._report._dmarc.{1}".format(
693+
target = "{}._report._dmarc.{}".format(
694694
domain.domain_name, email_domain
695695
)
696696
error_message = (
697-
"{0} does not indicate that it accepts DMARC reports about {1} - "
697+
"{} does not indicate that it accepts DMARC reports about {} - "
698698
"https://tools.ietf.org"
699699
"/html/rfc7489#section-7.1".format(
700700
email_domain, domain.domain_name
@@ -710,7 +710,7 @@ def dmarc_scan(resolver, domain):
710710
handle_error(
711711
"[DMARC]",
712712
domain,
713-
"{0}".format(error_message),
713+
"{}".format(error_message),
714714
)
715715
domain.dmarc_reports_address_error = True
716716
domain.valid_dmarc = False
@@ -721,7 +721,7 @@ def dmarc_scan(resolver, domain):
721721
dns.exception.Timeout,
722722
):
723723
handle_syntax_error(
724-
"[DMARC]", domain, "{0}".format(error_message)
724+
"[DMARC]", domain, "{}".format(error_message)
725725
)
726726
domain.dmarc_reports_address_error = True
727727
domain.valid_dmarc = False
@@ -738,7 +738,7 @@ def dmarc_scan(resolver, domain):
738738
"[DMARC]",
739739
domain,
740740
"The domain for reporting "
741-
"address {0} does not have any "
741+
"address {} does not have any "
742742
"MX records".format(email_address),
743743
)
744744
domain.valid_dmarc = False
@@ -847,7 +847,7 @@ def scan(
847847
dns_hostnames,
848848
)
849849

850-
logging.debug("[{0}]".format(domain_name.lower()))
850+
logging.debug("[{}]".format(domain_name.lower()))
851851

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

0 commit comments

Comments
 (0)