Skip to content

Commit 654a076

Browse files
vstinnervstinner
committed
gh-129205: Modernize test_eintr
* Use f-string. * Fix grammar: replace 'datas' with 'data' (and replace 'data' with 'item'). * Remove unused variables: 'pid' and 'old_mask'.
1 parent 1ed4487 commit 654a076

File tree

1 file changed

+47
-48
lines changed

1 file changed

+47
-48
lines changed

‎Lib/test/_test_eintr.py‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class OSEINTRTest(EINTRBaseTest):
9191
""" EINTR tests for the os module. """
9292

9393
def new_sleep_process(self):
94-
code = 'import time; time.sleep(%r)' % self.sleep_time
94+
code = f'import time; time.sleep({self.sleep_time!r})'
9595
return self.subprocess(code)
9696

9797
def _test_wait_multiple(self, wait_func):
@@ -130,26 +130,26 @@ def test_read(self):
130130

131131
# the payload below are smaller than PIPE_BUF, hence the writes will be
132132
# atomic
133-
datas = [b"hello", b"world", b"spam"]
133+
data = [b"hello", b"world", b"spam"]
134134

135135
code = '\n'.join((
136136
'import os, sys, time',
137137
'',
138138
'wr = int(sys.argv[1])',
139-
'datas = %r' % datas,
140-
'sleep_time = %r' % self.sleep_time,
139+
f'data = {data!r}',
140+
f'sleep_time = {self.sleep_time!r}',
141141
'',
142-
'for data in datas:',
142+
'for item in data:',
143143
' # let the parent block on read()',
144144
' time.sleep(sleep_time)',
145-
' os.write(wr, data)',
145+
' os.write(wr, item)',
146146
))
147147

148148
proc = self.subprocess(code, str(wr), pass_fds=[wr])
149149
with kill_on_error(proc):
150150
os.close(wr)
151-
for data in datas:
152-
self.assertEqual(data, os.read(rd, len(data)))
151+
for item in data:
152+
self.assertEqual(item, os.read(rd, len(item)))
153153
self.assertEqual(proc.wait(), 0)
154154

155155
def test_readinto(self):
@@ -159,28 +159,28 @@ def test_readinto(self):
159159

160160
# the payload below are smaller than PIPE_BUF, hence the writes will be
161161
# atomic
162-
datas = [b"hello", b"world", b"spam"]
162+
data = [b"hello", b"world", b"spam"]
163163

164164
code = '\n'.join((
165165
'import os, sys, time',
166166
'',
167167
'wr = int(sys.argv[1])',
168-
'datas = %r' % datas,
169-
'sleep_time = %r' % self.sleep_time,
168+
f'data = {data!r}',
169+
f'sleep_time = {self.sleep_time!r}',
170170
'',
171-
'for data in datas:',
171+
'for item in data:',
172172
' # let the parent block on read()',
173173
' time.sleep(sleep_time)',
174-
' os.write(wr, data)',
174+
' os.write(wr, item)',
175175
))
176176

177177
proc = self.subprocess(code, str(wr), pass_fds=[wr])
178178
with kill_on_error(proc):
179179
os.close(wr)
180-
for data in datas:
181-
buffer = bytearray(len(data))
182-
self.assertEqual(os.readinto(rd, buffer), len(data))
183-
self.assertEqual(buffer, data)
180+
for item in data:
181+
buffer = bytearray(len(item))
182+
self.assertEqual(os.readinto(rd, buffer), len(item))
183+
self.assertEqual(buffer, item)
184184
self.assertEqual(proc.wait(), 0)
185185

186186
def test_write(self):
@@ -195,8 +195,8 @@ def test_write(self):
195195
'import io, os, sys, time',
196196
'',
197197
'rd = int(sys.argv[1])',
198-
'sleep_time = %r' % self.sleep_time,
199-
'data = b"x" * %s' % support.PIPE_MAX_SIZE,
198+
f'sleep_time = {self.sleep_time!r}',
199+
f'data = b"x" * {support.PIPE_MAX_SIZE}',
200200
'data_len = len(data)',
201201
'',
202202
'# let the parent block on write()',
@@ -209,8 +209,8 @@ def test_write(self):
209209
'',
210210
'value = read_data.getvalue()',
211211
'if value != data:',
212-
' raise Exception("read error: %s vs %s bytes"',
213-
' % (len(value), data_len))',
212+
' raise Exception(f"read error: {len(value)}'
213+
' vs {data_len} bytes")',
214214
))
215215

216216
proc = self.subprocess(code, str(rd), pass_fds=[rd])
@@ -233,33 +233,33 @@ def _test_recv(self, recv_func):
233233
# wr closed explicitly by parent
234234

235235
# single-byte payload guard us against partial recv
236-
datas = [b"x", b"y", b"z"]
236+
data = [b"x", b"y", b"z"]
237237

238238
code = '\n'.join((
239239
'import os, socket, sys, time',
240240
'',
241241
'fd = int(sys.argv[1])',
242-
'family = %s' % int(wr.family),
243-
'sock_type = %s' % int(wr.type),
244-
'datas = %r' % datas,
245-
'sleep_time = %r' % self.sleep_time,
242+
f'family = {int(wr.family)}',
243+
f'sock_type = {int(wr.type)}',
244+
f'data = {data!r}',
245+
f'sleep_time = {self.sleep_time!r}',
246246
'',
247247
'wr = socket.fromfd(fd, family, sock_type)',
248248
'os.close(fd)',
249249
'',
250250
'with wr:',
251-
' for data in datas:',
251+
' for item in data:',
252252
' # let the parent block on recv()',
253253
' time.sleep(sleep_time)',
254-
' wr.sendall(data)',
254+
' wr.sendall(item)',
255255
))
256256

257257
fd = wr.fileno()
258258
proc = self.subprocess(code, str(fd), pass_fds=[fd])
259259
with kill_on_error(proc):
260260
wr.close()
261-
for data in datas:
262-
self.assertEqual(data, recv_func(rd, len(data)))
261+
for item in data:
262+
self.assertEqual(item, recv_func(rd, len(item)))
263263
self.assertEqual(proc.wait(), 0)
264264

265265
def test_recv(self):
@@ -281,10 +281,10 @@ def _test_send(self, send_func):
281281
'import os, socket, sys, time',
282282
'',
283283
'fd = int(sys.argv[1])',
284-
'family = %s' % int(rd.family),
285-
'sock_type = %s' % int(rd.type),
286-
'sleep_time = %r' % self.sleep_time,
287-
'data = b"xyz" * %s' % (support.SOCK_MAX_SIZE // 3),
284+
f'family = {int(rd.family)}',
285+
f'sock_type = {int(rd.type)}',
286+
f'sleep_time = {self.sleep_time!r}',
287+
f'data = b"xyz" * {support.SOCK_MAX_SIZE // 3}',
288288
'data_len = len(data)',
289289
'',
290290
'rd = socket.fromfd(fd, family, sock_type)',
@@ -300,8 +300,8 @@ def _test_send(self, send_func):
300300
' n += rd.recv_into(memoryview(received_data)[n:])',
301301
'',
302302
'if received_data != data:',
303-
' raise Exception("recv error: %s vs %s bytes"',
304-
' % (len(received_data), data_len))',
303+
' raise Exception(f"recv error: {len(received_data)}'
304+
' vs {data_len} bytes")',
305305
))
306306

307307
fd = rd.fileno()
@@ -333,9 +333,9 @@ def test_accept(self):
333333
code = '\n'.join((
334334
'import socket, time',
335335
'',
336-
'host = %r' % socket_helper.HOST,
337-
'port = %s' % port,
338-
'sleep_time = %r' % self.sleep_time,
336+
f'host = {socket_helper.HOST!r}',
337+
f'port = {port}',
338+
f'sleep_time = {self.sleep_time!r}',
339339
'',
340340
'# let parent block on accept()',
341341
'time.sleep(sleep_time)',
@@ -363,15 +363,15 @@ def _test_open(self, do_open_close_reader, do_open_close_writer):
363363
os_helper.unlink(filename)
364364
try:
365365
os.mkfifo(filename)
366-
except PermissionError as e:
367-
self.skipTest('os.mkfifo(): %s' % e)
366+
except PermissionError as exc:
367+
self.skipTest(f'os.mkfifo(): {exc!r}')
368368
self.addCleanup(os_helper.unlink, filename)
369369

370370
code = '\n'.join((
371371
'import os, time',
372372
'',
373-
'path = %a' % filename,
374-
'sleep_time = %r' % self.sleep_time,
373+
f'path = {filename!a}',
374+
f'sleep_time = {self.sleep_time!r}',
375375
'',
376376
'# let the parent block',
377377
'time.sleep(sleep_time)',
@@ -427,21 +427,20 @@ class SignalEINTRTest(EINTRBaseTest):
427427

428428
def check_sigwait(self, wait_func):
429429
signum = signal.SIGUSR1
430-
pid = os.getpid()
431430

432431
old_handler = signal.signal(signum, lambda *args: None)
433432
self.addCleanup(signal.signal, signum, old_handler)
434433

435434
code = '\n'.join((
436435
'import os, time',
437-
'pid = %s' % os.getpid(),
438-
'signum = %s' % int(signum),
439-
'sleep_time = %r' % self.sleep_time,
436+
f'pid = {os.getpid()}',
437+
f'signum = {int(signum)}',
438+
f'sleep_time = {self.sleep_time!r}',
440439
'time.sleep(sleep_time)',
441440
'os.kill(pid, signum)',
442441
))
443442

444-
old_mask = signal.pthread_sigmask(signal.SIG_BLOCK, [signum])
443+
signal.pthread_sigmask(signal.SIG_BLOCK, [signum])
445444
self.addCleanup(signal.pthread_sigmask, signal.SIG_UNBLOCK, [signum])
446445

447446
proc = self.subprocess(code)

0 commit comments

Comments
 (0)