Issue #12523: asynchat.async_chat.push() now raises a TypeError if it doesn't

get a bytes string
This commit is contained in:
Victor Stinner 2014-07-08 00:00:30 +02:00
parent ab826d11a3
commit d9e810a870
3 changed files with 22 additions and 0 deletions

View File

@ -181,6 +181,9 @@ class async_chat (asyncore.dispatcher):
self.close() self.close()
def push (self, data): def push (self, data):
if not isinstance(data, (bytes, bytearray, memoryview)):
raise TypeError('data argument must be byte-ish (%r)',
type(data))
sabs = self.ac_out_buffer_size sabs = self.ac_out_buffer_size
if len(data) > sabs: if len(data) > sabs:
for i in range(0, len(data), sabs): for i in range(0, len(data), sabs):

View File

@ -249,6 +249,22 @@ class TestAsynchat(unittest.TestCase):
# (which could still result in the client not having received anything) # (which could still result in the client not having received anything)
self.assertGreater(len(s.buffer), 0) self.assertGreater(len(s.buffer), 0)
def test_push(self):
# Issue #12523: push() should raise a TypeError if it doesn't get
# a bytes string
s, event = start_echo_server()
c = echo_client(b'\n', s.port)
data = b'bytes\n'
c.push(data)
c.push(bytearray(data))
c.push(memoryview(data))
self.assertRaises(TypeError, c.push, 10)
self.assertRaises(TypeError, c.push, 'unicode')
c.push(SERVER_QUIT)
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
s.join(timeout=TIMEOUT)
self.assertEqual(c.contents, [b'bytes', b'bytes', b'bytes'])
class TestAsynchat_WithPoll(TestAsynchat): class TestAsynchat_WithPoll(TestAsynchat):
usepoll = True usepoll = True

View File

@ -27,6 +27,9 @@ Core and Builtins
Library Library
------- -------
- Issue #12523: asynchat.async_chat.push() now raises a TypeError if it doesn't
get a bytes string
- Issue #21707: Add missing kwonlyargcount argument to - Issue #21707: Add missing kwonlyargcount argument to
ModuleFinder.replace_paths_in_code(). ModuleFinder.replace_paths_in_code().