diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2019-09-01 09:12:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-01 09:12:52 (GMT) |
| commit | 5eca7f3f3836cc734dfe8dc5ec669f3b4e9333fe (patch) | |
| tree | 2a3eee6b520cafadc4c3b950e73bad0c0b1aa5ce /Lib/test | |
| parent | eb8974616bc58f44b2a3c3e4ca2326894ae42c8f (diff) | |
| download | cpython-5eca7f3f3836cc734dfe8dc5ec669f3b4e9333fe.zip cpython-5eca7f3f3836cc734dfe8dc5ec669f3b4e9333fe.tar.gz cpython-5eca7f3f3836cc734dfe8dc5ec669f3b4e9333fe.tar.bz2 | |
bpo-15999: Always pass bool instead of int to socket.setblocking(). (GH-15621)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_asyncio/functional.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_timeout.py | 12 |
4 files changed, 14 insertions, 14 deletions
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 @@ class TestThreadedServer(SocketThread): 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 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest): 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 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest): # 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 @@ class NonblockConstantTest(unittest.TestCase): 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 @@ class ThreadedEchoServer(threading.Thread): 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 @@ class ThreadedTests(unittest.TestCase): 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 @@ class CreationTestCase(unittest.TestCase): 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) |
