Skip to content

Commit 4b8786f

Browse files
committed
Correct style code
1 parent 09d32b3 commit 4b8786f

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Lib/http/server.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,18 +172,14 @@ def __init__(self, server_address, RequestHandlerClass,
172172
def server_activate(self):
173173
"""Wrap the socket in SSLSocket."""
174174
super().server_activate()
175-
176175
context = self._create_context()
177176
self.socket = context.wrap_socket(self.socket, server_side=True)
178177

179178
def _create_context(self):
180179
"""Create a secure SSL context."""
181180
context = self.ssl.create_default_context(self.ssl.Purpose.CLIENT_AUTH)
182-
context.load_cert_chain(certfile=self.certfile,
183-
keyfile=self.keyfile,
184-
password=self.password)
181+
context.load_cert_chain(self.certfile, self.keyfile, self.password)
185182
context.set_alpn_protocols(self.alpn_protocols)
186-
187183
return context
188184

189185

Lib/test/test_httpservers.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import unittest
3232
from test import support
3333
from test.support import (
34-
is_apple, os_helper, requires_subprocess, threading_helper, import_helper
34+
is_apple, import_helper, os_helper, requires_subprocess, threading_helper
3535
)
3636

3737
try:
@@ -53,6 +53,7 @@ def read(self, n=None):
5353
class DummyRequestHandler(NoLogRequestHandler, SimpleHTTPRequestHandler):
5454
pass
5555

56+
5657
def create_https_server(
5758
certfile,
5859
keyfile=None,
@@ -377,8 +378,7 @@ class BaseHTTPSServerTestCase(BaseTestCase):
377378

378379
tls = (ONLYCERT, ONLYKEY, None) # values by default
379380

380-
class request_handler(NoLogRequestHandler, SimpleHTTPRequestHandler):
381-
pass
381+
request_handler = DummyRequestHandler
382382

383383
def test_get(self):
384384
response = self.request('/')
@@ -400,9 +400,9 @@ def test_valid_certdata(self):
400400
(self.ONLYCERT, self.ONLYKEY_PROTECTED, self.KEY_PASSWORD),
401401
]
402402
for certfile, keyfile, password in valid_certdata:
403-
with self.subTest(certfile=certfile,
404-
keyfile=keyfile,
405-
password=password):
403+
with self.subTest(
404+
certfile=certfile, keyfile=keyfile, password=password
405+
):
406406
server = create_https_server(certfile, keyfile, password)
407407
self.assertIsInstance(server, HTTPSServer)
408408
server.server_close()
@@ -417,9 +417,9 @@ def test_invalid_certdata(self):
417417
(self.CERTFILE_PROTECTED, None, self.BADPASSWORD),
418418
]
419419
for certfile, keyfile, password in invalid_certdata:
420-
with self.subTest(certfile=certfile,
421-
keyfile=keyfile,
422-
password=password):
420+
with self.subTest(
421+
certfile=certfile, keyfile=keyfile, password=password
422+
):
423423
with self.assertRaises(ssl.SSLError):
424424
create_https_server(certfile, keyfile, password)
425425

0 commit comments

Comments
 (0)