Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a8d630a

Browse files
author
Guido van Rossum
committed
asyncio: Various style nits.
1 parent 3a70392 commit a8d630a

6 files changed

Lines changed: 48 additions & 23 deletions

File tree

‎Lib/asyncio/base_events.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def create_connection(self, protocol_factory, host=None, port=None, *,
300300
raise ValueError('You must set server_hostname '
301301
'when using ssl without a host')
302302
server_hostname = host
303-
303+
304304
if host is not None or port is not None:
305305
if sock is not None:
306306
raise ValueError(

‎Lib/asyncio/windows_events.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ def create_pipe_connection(self, protocol_factory, address):
138138
@tasks.coroutine
139139
def start_serving_pipe(self, protocol_factory, address):
140140
server = PipeServer(address)
141+
141142
def loop(f=None):
142143
pipe = None
143144
try:
@@ -160,6 +161,7 @@ def loop(f=None):
160161
pipe.close()
161162
else:
162163
f.add_done_callback(loop)
164+
163165
self.call_soon(loop)
164166
return [server]
165167

@@ -209,6 +211,7 @@ def recv(self, conn, nbytes, flags=0):
209211
ov.WSARecv(conn.fileno(), nbytes, flags)
210212
else:
211213
ov.ReadFile(conn.fileno(), nbytes)
214+
212215
def finish(trans, key, ov):
213216
try:
214217
return ov.getresult()
@@ -217,6 +220,7 @@ def finish(trans, key, ov):
217220
raise ConnectionResetError(*exc.args)
218221
else:
219222
raise
223+
220224
return self._register(ov, conn, finish)
221225

222226
def send(self, conn, buf, flags=0):
@@ -226,6 +230,7 @@ def send(self, conn, buf, flags=0):
226230
ov.WSASend(conn.fileno(), buf, flags)
227231
else:
228232
ov.WriteFile(conn.fileno(), buf)
233+
229234
def finish(trans, key, ov):
230235
try:
231236
return ov.getresult()
@@ -234,13 +239,15 @@ def finish(trans, key, ov):
234239
raise ConnectionResetError(*exc.args)
235240
else:
236241
raise
242+
237243
return self._register(ov, conn, finish)
238244

239245
def accept(self, listener):
240246
self._register_with_iocp(listener)
241247
conn = self._get_accept_socket(listener.family)
242248
ov = _overlapped.Overlapped(NULL)
243249
ov.AcceptEx(listener.fileno(), conn.fileno())
250+
244251
def finish_accept(trans, key, ov):
245252
ov.getresult()
246253
# Use SO_UPDATE_ACCEPT_CONTEXT so getsockname() etc work.
@@ -249,6 +256,7 @@ def finish_accept(trans, key, ov):
249256
_overlapped.SO_UPDATE_ACCEPT_CONTEXT, buf)
250257
conn.settimeout(listener.gettimeout())
251258
return conn, conn.getpeername()
259+
252260
return self._register(ov, listener, finish_accept)
253261

254262
def connect(self, conn, address):
@@ -264,26 +272,31 @@ def connect(self, conn, address):
264272
raise
265273
ov = _overlapped.Overlapped(NULL)
266274
ov.ConnectEx(conn.fileno(), address)
275+
267276
def finish_connect(trans, key, ov):
268277
ov.getresult()
269278
# Use SO_UPDATE_CONNECT_CONTEXT so getsockname() etc work.
270279
conn.setsockopt(socket.SOL_SOCKET,
271280
_overlapped.SO_UPDATE_CONNECT_CONTEXT, 0)
272281
return conn
282+
273283
return self._register(ov, conn, finish_connect)
274284

275285
def accept_pipe(self, pipe):
276286
self._register_with_iocp(pipe)
277287
ov = _overlapped.Overlapped(NULL)
278288
ov.ConnectNamedPipe(pipe.fileno())
289+
279290
def finish(trans, key, ov):
280291
ov.getresult()
281292
return pipe
293+
282294
return self._register(ov, pipe, finish)
283295

284296
def connect_pipe(self, address):
285297
ov = _overlapped.Overlapped(NULL)
286298
ov.WaitNamedPipeAndConnect(address, self._iocp, ov.address)
299+
287300
def finish(err, handle, ov):
288301
# err, handle were arguments passed to PostQueuedCompletionStatus()
289302
# in a function run in a thread pool.
@@ -296,6 +309,7 @@ def finish(err, handle, ov):
296309
raise OSError(0, msg, None, err)
297310
else:
298311
return windows_utils.PipeHandle(handle)
312+
299313
return self._register(ov, None, finish, wait_for_post=True)
300314

301315
def wait_for_handle(self, handle, timeout=None):
@@ -432,8 +446,10 @@ def _start(self, args, shell, stdin, stdout, stderr, bufsize, **kwargs):
432446
self._proc = windows_utils.Popen(
433447
args, shell=shell, stdin=stdin, stdout=stdout, stderr=stderr,
434448
bufsize=bufsize, **kwargs)
449+
435450
def callback(f):
436451
returncode = self._proc.poll()
437452
self._process_exited(returncode)
453+
438454
f = self._loop._proactor.wait_for_handle(int(self._proc._handle))
439455
f.add_done_callback(callback)

‎Lib/asyncio/windows_utils.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
__all__ = ['socketpair', 'pipe', 'Popen', 'PIPE', 'PipeHandle']
2020

21-
#
21+
2222
# Constants/globals
23-
#
23+
2424

2525
BUFSIZE = 8192
2626
PIPE = subprocess.PIPE
2727
STDOUT = subprocess.STDOUT
2828
_mmap_counter = itertools.count()
2929

30-
#
30+
3131
# Replacement for socket.socketpair()
32-
#
32+
3333

3434
def socketpair(family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0):
3535
"""A socket pair usable as a self-pipe, for Windows.
@@ -57,9 +57,9 @@ def socketpair(family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0):
5757
lsock.close()
5858
return (ssock, csock)
5959

60-
#
60+
6161
# Replacement for os.pipe() using handles instead of fds
62-
#
62+
6363

6464
def pipe(*, duplex=False, overlapped=(True, True), bufsize=BUFSIZE):
6565
"""Like os.pipe() but with overlapped support and using handles not fds."""
@@ -105,9 +105,9 @@ def pipe(*, duplex=False, overlapped=(True, True), bufsize=BUFSIZE):
105105
_winapi.CloseHandle(h2)
106106
raise
107107

108-
#
108+
109109
# Wrapper for a pipe handle
110-
#
110+
111111

112112
class PipeHandle:
113113
"""Wrapper for an overlapped pipe handle which is vaguely file-object like.
@@ -137,9 +137,9 @@ def __enter__(self):
137137
def __exit__(self, t, v, tb):
138138
self.close()
139139

140-
#
140+
141141
# Replacement for subprocess.Popen using overlapped pipe handles
142-
#
142+
143143

144144
class Popen(subprocess.Popen):
145145
"""Replacement for subprocess.Popen using overlapped pipe handles.

‎Lib/test/test_asyncio/test_base_events.py‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -446,34 +446,41 @@ def getaddrinfo_task(*args, **kwds):
446446

447447
def test_create_connection_server_hostname_default(self):
448448
self.loop.getaddrinfo = unittest.mock.Mock()
449+
449450
def mock_getaddrinfo(*args, **kwds):
450451
f = futures.Future(loop=self.loop)
451452
f.set_result([(socket.AF_INET, socket.SOCK_STREAM,
452453
socket.SOL_TCP, '', ('1.2.3.4', 80))])
453454
return f
455+
454456
self.loop.getaddrinfo.side_effect = mock_getaddrinfo
455457
self.loop.sock_connect = unittest.mock.Mock()
456458
self.loop.sock_connect.return_value = ()
457459
self.loop._make_ssl_transport = unittest.mock.Mock()
458-
def mock_make_ssl_transport(sock, protocol, sslcontext, waiter, **kwds):
460+
461+
def mock_make_ssl_transport(sock, protocol, sslcontext, waiter,
462+
**kwds):
459463
waiter.set_result(None)
464+
460465
self.loop._make_ssl_transport.side_effect = mock_make_ssl_transport
461466
ANY = unittest.mock.ANY
462467
# First try the default server_hostname.
463468
self.loop._make_ssl_transport.reset_mock()
464469
coro = self.loop.create_connection(MyProto, 'python.org', 80, ssl=True)
465470
self.loop.run_until_complete(coro)
466-
self.loop._make_ssl_transport.assert_called_with(ANY, ANY, ANY, ANY,
467-
server_side=False,
468-
server_hostname='python.org')
471+
self.loop._make_ssl_transport.assert_called_with(
472+
ANY, ANY, ANY, ANY,
473+
server_side=False,
474+
server_hostname='python.org')
469475
# Next try an explicit server_hostname.
470476
self.loop._make_ssl_transport.reset_mock()
471477
coro = self.loop.create_connection(MyProto, 'python.org', 80, ssl=True,
472478
server_hostname='perl.com')
473479
self.loop.run_until_complete(coro)
474-
self.loop._make_ssl_transport.assert_called_with(ANY, ANY, ANY, ANY,
475-
server_side=False,
476-
server_hostname='perl.com')
480+
self.loop._make_ssl_transport.assert_called_with(
481+
ANY, ANY, ANY, ANY,
482+
server_side=False,
483+
server_hostname='perl.com')
477484
# Finally try an explicit empty server_hostname.
478485
self.loop._make_ssl_transport.reset_mock()
479486
coro = self.loop.create_connection(MyProto, 'python.org', 80, ssl=True,
@@ -485,17 +492,20 @@ def mock_make_ssl_transport(sock, protocol, sslcontext, waiter, **kwds):
485492

486493
def test_create_connection_server_hostname_errors(self):
487494
# When not using ssl, server_hostname must be None (but '' is OK).
488-
coro = self.loop.create_connection(MyProto, 'python.org', 80, server_hostname='')
495+
coro = self.loop.create_connection(MyProto, 'python.org', 80,
496+
server_hostname='')
489497
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
490-
coro = self.loop.create_connection(MyProto, 'python.org', 80, server_hostname='python.org')
498+
coro = self.loop.create_connection(MyProto, 'python.org', 80,
499+
server_hostname='python.org')
491500
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
492501

493502
# When using ssl, server_hostname may be None if host is non-empty.
494503
coro = self.loop.create_connection(MyProto, '', 80, ssl=True)
495504
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
496505
coro = self.loop.create_connection(MyProto, None, 80, ssl=True)
497506
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
498-
coro = self.loop.create_connection(MyProto, None, None, ssl=True, sock=socket.socket())
507+
coro = self.loop.create_connection(MyProto, None, None,
508+
ssl=True, sock=socket.socket())
499509
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
500510

501511
def test_create_server_empty_host(self):

‎Lib/test/test_asyncio/test_events.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,6 @@ class SelectEventLoopTests(EventLoopTestsMixin, unittest.TestCase):
12761276
def create_event_loop(self):
12771277
return windows_events.SelectorEventLoop()
12781278

1279-
12801279
class ProactorEventLoopTests(EventLoopTestsMixin,
12811280
SubprocessTestsMixin,
12821281
unittest.TestCase):

‎Lib/test/test_asyncio/test_windows_events.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def _test_pipe(self):
7777
stream_reader = streams.StreamReader(loop=self.loop)
7878
protocol = streams.StreamReaderProtocol(stream_reader)
7979
trans, proto = yield from self.loop.create_pipe_connection(
80-
lambda:protocol, ADDRESS)
80+
lambda: protocol, ADDRESS)
8181
self.assertIsInstance(trans, transports.Transport)
8282
self.assertEqual(protocol, proto)
8383
clients.append((stream_reader, trans))

0 commit comments

Comments
 (0)