8000 Use multi-line string instead of string building · python/cpython@96078a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 96078a1

Browse files
WillChilds-KleinWillChilds-Klein
committed
Use multi-line string instead of string building
1 parent 50c41e6 commit 96078a1

File tree

3 files changed

+46
-52
lines changed

3 files changed

+46
-52
lines changed

‎Lib/test/test_asyncio/test_events.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,13 +1127,11 @@ def test_create_server_ssl_match_failed(self):
11271127
ssl=sslcontext_client)
11281128

11291129
# Allow for flexible libssl error messages.
1130-
regex = "("
1131-
# OpenSSL
1132-
regex += "IP address mismatch, certificate is not valid for '127.0.0.1'"
1133-
regex += "|"
1134-
# AWS-LC
1135-
regex += "CERTIFICATE_VERIFY_FAILED"
1136-
regex += ")"
1130+
regex = re.compile(r"""(
1131+
IP address mismatch, certificate is not valid for '127.0.0.1' # OpenSSL
1132+
|
1133+
CERTIFICATE_VERIFY_FAILED # AWS-LC
1134+
)""", re.X)
11371135
with mock.patch.object(self.loop, 'call_exception_handler'):
11381136
with test_utils.disable_logger():
11391137
with self.assertRaisesRegex(ssl.CertificateError, regex):

‎Lib/test/test_imaplib.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -559,13 +559,11 @@ def test_ssl_raises(self):
559559
ssl_context.load_verify_locations(CAFILE)
560560

561561
# Allow for flexible libssl error messages.
562-
regex = "("
563-
# OpenSSL
564-
regex += "IP address mismatch, certificate is not valid for '127.0.0.1'"
565-
regex += "|"
566-
# AWS-LC
567-
regex += "CERTIFICATE_VERIFY_FAILED"
568-
regex += ")"
562+
regex = re.compile(r"""(
563+
IP address mismatch, certificate is not valid for '127.0.0.1' # OpenSSL
564+
|
565+
CERTIFICATE_VERIFY_FAILED # AWS-LC
566+
)""", re.X)
569567
with self.assertRaisesRegex(ssl.CertificateError, regex):
570568
_, server = self._setup(SimpleIMAPHandler)
571569
client = self.imap_class(*server.server_address,
@@ -961,13 +959,11 @@ def test_ssl_verified(self):
961959
ssl_context.load_verify_locations(CAFILE)
962960

963961
# Allow for flexible libssl error messages.
964-
regex = "("
965-
# OpenSSL
966-
regex += "IP address mismatch, certificate is not valid for '127.0.0.1'"
967-
regex += "|"
968-
# AWS-LC
969-
regex += "CERTIFICATE_VERIFY_FAILED"
970-
regex += ")"
962+
regex = re.compile(r"""(
963+
IP address mismatch, certificate is not valid for '127.0.0.1' # OpenSSL
964+
|
965+
CERTIFICATE_VERIFY_FAILED # AWS-LC
966+
)""", re.X)
971967
with self.assertRaisesRegex(ssl.CertificateError, regex):
972968
with self.reaped_server(SimpleIMAPHandler) as server:
973969
client = self.imap_class(*server.server_address,

‎Lib/test/test_ssl.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,11 +1180,11 @@ def test_load_cert_chain(self):
11801180
# Mismatching key and cert
11811181
ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
11821182
# Allow for flexible libssl error messages.
1183-
regex = "("
1184-
regex += "key values mismatch" # OpenSSL
1185-
regex += "|"
1186-
regex += "KEY_VALUES_MISMATCH" # AWS-LC
1187-
regex += ")"
1183+
regex = re.compile(r"""(
1184+
key values mismatch # OpenSSL
1185+
|
1186+
KEY_VALUES_MISMATCH # AWS-LC
1187+
)""", re.X)
11881188
with self.assertRaisesRegex(ssl.SSLError, regex):
11891189
ctx.load_cert_chain(CAFILE_CACERT, ONLYKEY)
11901190
# Password protected key and cert
@@ -1841,11 +1841,11 @@ def test_connect_fail(self):
18411841
cert_reqs=ssl.CERT_REQUIRED)
18421842
self.addCleanup(s.close)
18431843
# Allow for flexible libssl error messages.
1844-
regex = "("
1845-
regex += "certificate verify failed" # OpenSSL
1846-
regex += "|"
1847-
regex += "CERTIFICATE_VERIFY_FAILED" # AWS-LC
1848-
regex += ")"
1844+
regex = re.compile(r"""(
1845+
certificate verify failed # OpenSSL
1846+
|
1847+
CERTIFICATE_VERIFY_FAILED # AWS-LC
1848+
)""", re.X)
18491849
self.assertRaisesRegex(ssl.SSLError, regex,
18501850
s.connect, self.server_addr)
18511851

@@ -1915,11 +1915,11 @@ def test_connect_with_context_fail(self):
19151915
)
19161916
self.addCleanup(s.close)
19171917
# Allow for flexible libssl error messages.
1918-
regex = "("
1919-
regex += "certificate verify failed" # OpenSSL
1920-
regex += "|"
1921-
regex += "CERTIFICATE_VERIFY_FAILED" # AWS-LC
1922-
regex += ")"
1918+
regex = re.compile(r"""(
1919+
certificate verify failed # OpenSSL
1920+
|
1921+
CERTIFICATE_VERIFY_FAILED # AWS-LC
1922+
)""", re.X)
19231923
self.assertRaisesRegex(ssl.SSLError, regex,
19241924
s.connect, self.server_addr)
19251925

@@ -2872,11 +2872,11 @@ def test_crl_check(self):
28722872

28732873
server = ThreadedEchoServer(context=server_context, chatty=True)
28742874
# Allow for flexible libssl error messages.
2875-
regex = "("
2876-
regex += "certificate verify failed" # OpenSSL
2877-
regex += "|"
2878-
regex += "CERTIFICATE_VERIFY_FAILED" # AWS-LC
2879-
regex += ")"
2875+
regex = re.compile(r"""(
2876+
certificate verify failed # OpenSSL
2877+
|
2878+
CERTIFICATE_VERIFY_FAILED # AWS-LC
2879+
)""", re.X)
28802880
with server:
28812881
with client_context.wrap_socket(socket.socket(),
28822882
server_hostname=hostname) as s:
@@ -2912,11 +2912,11 @@ def test_check_hostname(self):
29122912
# incorrect hostname should raise an exception
29132913
server = ThreadedEchoServer(context=server_context, chatty=True)
29142914
# Allow for flexible libssl error messages.
2915-
regex = "("
2916-
regex += "Hostname mismatch, certificate is not valid" # OpenSSL
2917-
regex += "|"
2918-
regex += "CERTIFICATE_VERIFY_FAILED" # AWS-LC
2919-
regex += ")"
2915+
regex = re.compile(r"""(
2916+
certificate verify failed # OpenSSL
2917+
|
2918+
CERTIFICATE_VERIFY_FAILED # AWS-LC
2919+
)""", re.X)
29202920
with server:
29212921
with client_context.wrap_socket(socket.socket(),
29222922
server_hostname="invalid") as s:
@@ -3195,13 +3195,13 @@ def test_ssl_cert_verify_error(self):
31953195
self.assertEqual(e.verify_code, 20)
31963196
self.assertEqual(e.verify_message, msg)
31973197
# Allow for flexible libssl error messages.
3198-
regex = "(" + msg + "|CERTIFICATE_VERIFY_FAILED)"
3198+
regex = f"({msg}|CERTIFICATE_VERIFY_FAILED)"
31993199
self.assertRegex(repr(e), regex)
3200-
regex = "("
3201-
regex += "certificate verify failed" # OpenSSL
3202-
regex += "|"
3203-
regex += "CERTIFICATE_VERIFY_FAILED" # AWS-LC
3204-
regex += ")"
3200+
regex = re.compile(r"""(
3201+
certificate verify failed # OpenSSL
3202+
|
3203+
CERTIFICATE_VERIFY_FAILED # AWS-LC
3204+
)""", re.X)
32053205
self.assertRegex(repr(e), regex)
32063206

32073207
def test_PROTOCOL_TLS(self):

0 commit comments

Comments
 (0)
0