From d1098c3e22ea3f43039039e3a8fbb356c4576cb2 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Fri, 16 May 2025 07:28:50 +0200 Subject: [PATCH] flake8 regression E261 --- radicale/app/report.py | 2 +- radicale/auth/htpasswd.py | 2 +- radicale/tests/test_base.py | 4 ++-- radicale/utils.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/radicale/app/report.py b/radicale/app/report.py index deb5a4ca..c6966777 100644 --- a/radicale/app/report.py +++ b/radicale/app/report.py @@ -177,7 +177,7 @@ def xml_report(base_prefix: str, path: str, xml_request: Optional[ET.Element], props: Union[ET.Element, List] if root.find(xmlutils.make_clark("D:prop")) is not None: - props = root.find(xmlutils.make_clark("D:prop")) # type: ignore[assignment] + props = root.find(xmlutils.make_clark("D:prop")) # type: ignore[assignment] else: props = [] diff --git a/radicale/auth/htpasswd.py b/radicale/auth/htpasswd.py index 07f0b0fe..dd66dfbd 100644 --- a/radicale/auth/htpasswd.py +++ b/radicale/auth/htpasswd.py @@ -96,7 +96,7 @@ class Auth(auth.BaseAuth): self._has_bcrypt = False self._has_argon2 = False self._htpasswd_ok = False - self._htpasswd_not_ok_reminder_seconds = 60 # currently hardcoded + self._htpasswd_not_ok_reminder_seconds = 60 # currently hardcoded (self._htpasswd_ok, self._htpasswd_bcrypt_use, self._htpasswd_argon2_use, self._htpasswd, self._htpasswd_size, self._htpasswd_mtime_ns) = self._read_htpasswd(True, False) self._lock = threading.Lock() diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py index 21a7873f..d2b26949 100644 --- a/radicale/tests/test_base.py +++ b/radicale/tests/test_base.py @@ -1319,7 +1319,7 @@ permissions: RrWw""") """], "valarm", items=[1, 2]) assert "/calendar.ics/valarm1.ics" not in answer - assert "/calendar.ics/valarm2.ics" in answer # absolute date + assert "/calendar.ics/valarm2.ics" in answer # absolute date answer = self._test_filter(["""\ @@ -1348,7 +1348,7 @@ permissions: RrWw""") """], "valarm", items=[1, 2]) - assert "/calendar.ics/valarm1.ics" in answer # -15 min offset + assert "/calendar.ics/valarm1.ics" in answer # -15 min offset assert "/calendar.ics/valarm2.ics" not in answer def test_time_range_filter_todos_completed(self) -> None: diff --git a/radicale/utils.py b/radicale/utils.py index e0ae92a0..4f759f58 100644 --- a/radicale/utils.py +++ b/radicale/utils.py @@ -102,7 +102,7 @@ def ssl_context_options_by_protocol(protocol: str, ssl_context_options): ssl_context_options |= ssl.OP_NO_TLSv1_3 logger.debug("SSL cleared SSL context options: '0x%x'", ssl_context_options) for entry in protocol.split(): - entry = entry.strip('+') # remove trailing '+' + entry = entry.strip('+') # remove trailing '+' if entry == "ALL": logger.debug("SSL context options, enable ALL (some maybe not supported by underlying OpenSSL, SSLv2 not enabled at all)") ssl_context_options &= ~ssl.OP_NO_SSLv3 @@ -162,7 +162,7 @@ def ssl_context_options_by_protocol(protocol: str, ssl_context_options): def ssl_context_minimum_version_by_options(ssl_context_options): logger.debug("SSL calculate minimum version by context options: '0x%x'", ssl_context_options) - ssl_context_minimum_version = ssl.TLSVersion.SSLv3 # default + ssl_context_minimum_version = ssl.TLSVersion.SSLv3 # default if ((ssl_context_options & ssl.OP_NO_SSLv3) and (ssl_context_minimum_version == ssl.TLSVersion.SSLv3)): ssl_context_minimum_version = ssl.TLSVersion.TLSv1 if ((ssl_context_options & ssl.OP_NO_TLSv1) and (ssl_context_minimum_version == ssl.TLSVersion.TLSv1)): @@ -172,7 +172,7 @@ def ssl_context_minimum_version_by_options(ssl_context_options): if ((ssl_context_options & ssl.OP_NO_TLSv1_2) and (ssl_context_minimum_version == ssl.TLSVersion.TLSv1_2)): ssl_context_minimum_version = ssl.TLSVersion.TLSv1_3 if ((ssl_context_options & ssl.OP_NO_TLSv1_3) and (ssl_context_minimum_version == ssl.TLSVersion.TLSv1_3)): - ssl_context_minimum_version = 0 # all disabled + ssl_context_minimum_version = 0 # all disabled logger.debug("SSL context options: '0x%x' results in minimum version: %s", ssl_context_options, ssl_context_minimum_version) return ssl_context_minimum_version @@ -180,7 +180,7 @@ def ssl_context_minimum_version_by_options(ssl_context_options): def ssl_context_maximum_version_by_options(ssl_context_options): logger.debug("SSL calculate maximum version by context options: '0x%x'", ssl_context_options) - ssl_context_maximum_version = ssl.TLSVersion.TLSv1_3 # default + ssl_context_maximum_version = ssl.TLSVersion.TLSv1_3 # default if ((ssl_context_options & ssl.OP_NO_TLSv1_3) and (ssl_context_maximum_version == ssl.TLSVersion.TLSv1_3)): ssl_context_maximum_version = ssl.TLSVersion.TLSv1_2 if ((ssl_context_options & ssl.OP_NO_TLSv1_2) and (ssl_context_maximum_version == ssl.TLSVersion.TLSv1_2)):