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

Skip to content

Commit 5eca7f3

Browse files
bpo-15999: Always pass bool instead of int to socket.setblocking(). (GH-15621)
1 parent eb89746 commit 5eca7f3

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

Doc/howto/sockets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ know about the mechanics of using sockets. You'll still use the same calls, in
317317
much the same ways. It's just that, if you do it right, your app will be almost
318318
inside-out.
319319

320-
In Python, you use ``socket.setblocking(0)`` to make it non-blocking. In C, it's
320+
In Python, you use ``socket.setblocking(False)`` to make it non-blocking. In C, it's
321321
more complex, (for one thing, you'll need to choose between the BSD flavor
322322
``O_NONBLOCK`` and the almost indistinguishable Posix flavor ``O_NDELAY``, which
323323
is completely different from ``TCP_NODELAY``), but it's the exact same idea. You

Lib/asyncore.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def __init__(self, sock=None, map=None):
228228
if sock:
229229
# Set to nonblocking just to make sure for cases where we
230230
# get a socket from a blocking source.
231-
sock.setblocking(0)
231+
sock.setblocking(False)
232232
self.set_socket(sock, map)
233233
self.connected = True
234234
# The constructor no longer requires that the socket
@@ -280,7 +280,7 @@ def del_channel(self, map=None):
280280
def create_socket(self, family=socket.AF_INET, type=socket.SOCK_STREAM):
281281
self.family_and_type = family, type
282282
sock = socket.socket(family, type)
283-
sock.setblocking(0)
283+
sock.setblocking(False)
284284
self.set_socket(sock)
285285

286286
def set_socket(self, sock, map=None):

Lib/test/test_asyncio/functional.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def stop(self):
225225
def run(self):
226226
try:
227227
with self._sock:
228-
self._sock.setblocking(0)
228+
self._sock.setblocking(False)
229229
self._run()
230230
finally:
231231
self._s1.close()

Lib/test/test_socket.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4597,7 +4597,7 @@ def _testInheritFlagsTimeout(self):
45974597

45984598
def testAccept(self):
45994599
# Testing non-blocking accept
4600-
self.serv.setblocking(0)
4600+
self.serv.setblocking(False)
46014601

46024602
# connect() didn't start: non-blocking accept() fails
46034603
start_time = time.monotonic()
@@ -4628,7 +4628,7 @@ def testRecv(self):
46284628
# Testing non-blocking recv
46294629
conn, addr = self.serv.accept()
46304630
self.addCleanup(conn.close)
4631-
conn.setblocking(0)
4631+
conn.setblocking(False)
46324632

46334633
# the server didn't send data yet: non-blocking recv() fails
46344634
with self.assertRaises(BlockingIOError):
@@ -5698,15 +5698,15 @@ def test_SOCK_NONBLOCK(self):
56985698
with socket.socket(socket.AF_INET,
56995699
socket.SOCK_STREAM | socket.SOCK_NONBLOCK) as s:
57005700
self.checkNonblock(s)
5701-
s.setblocking(1)
5701+
s.setblocking(True)
57025702
self.checkNonblock(s, nonblock=False)
5703-
s.setblocking(0)
5703+
s.setblocking(False)
57045704
self.checkNonblock(s)
57055705
s.settimeout(None)
57065706
self.checkNonblock(s, nonblock=False)
57075707
s.settimeout(2.0)
57085708
self.checkNonblock(s, timeout=2.0)
5709-
s.setblocking(1)
5709+
s.setblocking(True)
57105710
self.checkNonblock(s, nonblock=False)
57115711
# defaulttimeout
57125712
t = socket.getdefaulttimeout()

Lib/test/test_ssl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ def __init__(self, server, connsock, addr):
22092209
self.running = False
22102210
self.sock = connsock
22112211
self.addr = addr
2212-
self.sock.setblocking(1)
2212+
self.sock.setblocking(True)
22132213
self.sslconn = None
22142214
threading.Thread.__init__(self)
22152215
self.daemon = True
@@ -3255,7 +3255,7 @@ def test_starttls(self):
32553255
wrapped = False
32563256
with server:
32573257
s = socket.socket()
3258-
s.setblocking(1)
3258+
s.setblocking(True)
32593259
s.connect((HOST, server.port))
32603260
if support.verbose:
32613261
sys.stdout.write("\n")

Lib/test/test_timeout.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,24 @@ def testRangeCheck(self):
7979
def testTimeoutThenBlocking(self):
8080
# Test settimeout() followed by setblocking()
8181
self.sock.settimeout(10)
82-
self.sock.setblocking(1)
82+
self.sock.setblocking(True)
8383
self.assertEqual(self.sock.gettimeout(), None)
84-
self.sock.setblocking(0)
84+
self.sock.setblocking(False)
8585
self.assertEqual(self.sock.gettimeout(), 0.0)
8686

8787
self.sock.settimeout(10)
88-
self.sock.setblocking(0)
88+
self.sock.setblocking(False)
8989
self.assertEqual(self.sock.gettimeout(), 0.0)
90-
self.sock.setblocking(1)
90+
self.sock.setblocking(True)
9191
self.assertEqual(self.sock.gettimeout(), None)
9292

9393
def testBlockingThenTimeout(self):
9494
# Test setblocking() followed by settimeout()
95-
self.sock.setblocking(0)
95+
self.sock.setblocking(False)
9696
self.sock.settimeout(1)
9797
self.assertEqual(self.sock.gettimeout(), 1)
9898

99-
self.sock.setblocking(1)
99+
self.sock.setblocking(True)
100100
self.sock.settimeout(1)
101101
self.assertEqual(self.sock.gettimeout(), 1)
102102

Modules/socketmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ recvfrom_into(buffer[, nbytes, [, flags])\n\
146146
sendall(data[, flags]) -- send all data\n\
147147
send(data[, flags]) -- send data, may not send all of it\n\
148148
sendto(data[, flags], addr) -- send data to a given address\n\
149-
setblocking(0 | 1) -- set or clear the blocking I/O flag\n\
149+
setblocking(bool) -- set or clear the blocking I/O flag\n\
150150
getblocking() -- return True if socket is blocking, False if non-blocking\n\
151151
setsockopt(level, optname, value[, optlen]) -- set socket options\n\
152152
settimeout(None | float) -- set or clear the timeout\n\

0 commit comments

Comments
 (0)