bpo-15999: Always pass bool instead of int to socket.setblocking(). (GH-15621)
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 0e92be3..ce16f11 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -228,7 +228,7 @@
if sock:
# Set to nonblocking just to make sure for cases where we
# get a socket from a blocking source.
- sock.setblocking(0)
+ sock.setblocking(False)
self.set_socket(sock, map)
self.connected = True
# The constructor no longer requires that the socket
@@ -280,7 +280,7 @@
def create_socket(self, family=socket.AF_INET, type=socket.SOCK_STREAM):
self.family_and_type = family, type
sock = socket.socket(family, type)
- sock.setblocking(0)
+ sock.setblocking(False)
self.set_socket(sock)
def set_socket(self, sock, map=None):
diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py
index 70cd140..4620d3e 100644
--- a/Lib/test/test_asyncio/functional.py
+++ b/Lib/test/test_asyncio/functional.py
@@ -225,7 +225,7 @@
def run(self):
try:
with self._sock:
- self._sock.setblocking(0)
+ self._sock.setblocking(False)
self._run()
finally:
self._s1.close()
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index ce816cd..14ff561 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4597,7 +4597,7 @@
def testAccept(self):
# Testing non-blocking accept
- self.serv.setblocking(0)
+ self.serv.setblocking(False)
# connect() didn't start: non-blocking accept() fails
start_time = time.monotonic()
@@ -4628,7 +4628,7 @@
# Testing non-blocking recv
conn, addr = self.serv.accept()
self.addCleanup(conn.close)
- conn.setblocking(0)
+ conn.setblocking(False)
# the server didn't send data yet: non-blocking recv() fails
with self.assertRaises(BlockingIOError):
@@ -5698,15 +5698,15 @@
with socket.socket(socket.AF_INET,
socket.SOCK_STREAM | socket.SOCK_NONBLOCK) as s:
self.checkNonblock(s)
- s.setblocking(1)
+ s.setblocking(True)
self.checkNonblock(s, nonblock=False)
- s.setblocking(0)
+ s.setblocking(False)
self.checkNonblock(s)
s.settimeout(None)
self.checkNonblock(s, nonblock=False)
s.settimeout(2.0)
self.checkNonblock(s, timeout=2.0)
- s.setblocking(1)
+ s.setblocking(True)
self.checkNonblock(s, nonblock=False)
# defaulttimeout
t = socket.getdefaulttimeout()
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index afc5be9..6ad0b61 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2209,7 +2209,7 @@
self.running = False
self.sock = connsock
self.addr = addr
- self.sock.setblocking(1)
+ self.sock.setblocking(True)
self.sslconn = None
threading.Thread.__init__(self)
self.daemon = True
@@ -3255,7 +3255,7 @@
wrapped = False
with server:
s = socket.socket()
- s.setblocking(1)
+ s.setblocking(True)
s.connect((HOST, server.port))
if support.verbose:
sys.stdout.write("\n")
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index b07c07c..0fe4c7a 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -79,24 +79,24 @@
def testTimeoutThenBlocking(self):
# Test settimeout() followed by setblocking()
self.sock.settimeout(10)
- self.sock.setblocking(1)
+ self.sock.setblocking(True)
self.assertEqual(self.sock.gettimeout(), None)
- self.sock.setblocking(0)
+ self.sock.setblocking(False)
self.assertEqual(self.sock.gettimeout(), 0.0)
self.sock.settimeout(10)
- self.sock.setblocking(0)
+ self.sock.setblocking(False)
self.assertEqual(self.sock.gettimeout(), 0.0)
- self.sock.setblocking(1)
+ self.sock.setblocking(True)
self.assertEqual(self.sock.gettimeout(), None)
def testBlockingThenTimeout(self):
# Test setblocking() followed by settimeout()
- self.sock.setblocking(0)
+ self.sock.setblocking(False)
self.sock.settimeout(1)
self.assertEqual(self.sock.gettimeout(), 1)
- self.sock.setblocking(1)
+ self.sock.setblocking(True)
self.sock.settimeout(1)
self.assertEqual(self.sock.gettimeout(), 1)