[Python-checkins] cpython (merge 3.4 -> default): (Merge 3.4) Issue #16133: The asynchat.async_chat.handle_read() method now
victor.stinner
python-checkins at python.org
Thu Jul 24 19:00:40 CEST 2014
http://hg.python.org/cpython/rev/aa150c7a5d24
changeset: 91832:aa150c7a5d24
parent: 91829:5d70ac83d104
parent: 91831:b7f144d14798
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Jul 24 19:00:28 2014 +0200
summary:
(Merge 3.4) Issue #16133: The asynchat.async_chat.handle_read() method now
ignores BlockingIOError exceptions. Initial patch written by Xavier de Gaye.
Document also in asyncore documentation that recv() may raise BlockingIOError.
files:
Doc/library/asyncore.rst | 4 ++++
Lib/asynchat.py | 2 ++
Lib/test/test_asynchat.py | 17 +++++++++++++++++
Misc/NEWS | 3 +++
4 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -216,6 +216,10 @@
empty bytes object implies that the channel has been closed from the
other end.
+ Note that :meth:`recv` may raise :exc:`BlockingIOError` , even though
+ :func:`select.select` or :func:`select.poll` has reported the socket
+ ready for reading.
+
.. method:: listen(backlog)
diff --git a/Lib/asynchat.py b/Lib/asynchat.py
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -115,6 +115,8 @@
try:
data = self.recv(self.ac_in_buffer_size)
+ except BlockingIOError:
+ return
except OSError as why:
self.handle_error()
return
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -7,11 +7,13 @@
import asynchat
import asyncore
+import errno
import socket
import sys
import time
import unittest
import warnings
+import unittest.mock
try:
import threading
except ImportError:
@@ -274,6 +276,21 @@
usepoll = True
+class TestAsynchatMocked(unittest.TestCase):
+ def test_blockingioerror(self):
+ # Issue #16133: handle_read() must ignore BlockingIOError
+ sock = unittest.mock.Mock()
+ sock.recv.side_effect = BlockingIOError(errno.EAGAIN)
+
+ dispatcher = asynchat.async_chat()
+ dispatcher.set_socket(sock)
+ self.addCleanup(dispatcher.del_channel)
+
+ with unittest.mock.patch.object(dispatcher, 'handle_error') as error:
+ dispatcher.handle_read()
+ self.assertFalse(error.called)
+
+
class TestHelperFunctions(unittest.TestCase):
def test_find_prefix_at_end(self):
self.assertEqual(asynchat.find_prefix_at_end("qwerty\r", "\r\n"), 1)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -108,6 +108,9 @@
Library
-------
+- Issue #16133: The asynchat.async_chat.handle_read() method now ignores
+ BlockingIOError exceptions.
+
- Issue #19884: readline: Disable the meta modifier key if stdout is not
a terminal to not write the ANSI sequence "\033[1034h" into stdout. This
sequence is used on some terminal (ex: TERM=xterm-256color") to enable
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list