mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
bpo-27340: Use memoryview in SSLSocket.sendall() (#3384)
* bpo-27340: Use memoryview in SSLSocket.sendall() SSLSocket.sendall() now uses memoryview to create slices of data. This fix support for all bytes-like object. It is also more efficient and avoids costly copies. Signed-off-by: Christian Heimes <christian@python.org> * Cast view to bytes, fix typo Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
parent
17c9ac927b
commit
888bbdc192
3 changed files with 19 additions and 5 deletions
|
@ -959,11 +959,12 @@ class SSLSocket(socket):
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"non-zero flags not allowed in calls to sendall() on %s" %
|
"non-zero flags not allowed in calls to sendall() on %s" %
|
||||||
self.__class__)
|
self.__class__)
|
||||||
amount = len(data)
|
|
||||||
count = 0
|
count = 0
|
||||||
while (count < amount):
|
with memoryview(data) as view, view.cast("B") as byte_view:
|
||||||
v = self.send(data[count:])
|
amount = len(byte_view)
|
||||||
count += v
|
while count < amount:
|
||||||
|
v = self.send(byte_view[count:])
|
||||||
|
count += v
|
||||||
else:
|
else:
|
||||||
return socket.sendall(self, data, flags)
|
return socket.sendall(self, data, flags)
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,10 @@ import asyncore
|
||||||
import weakref
|
import weakref
|
||||||
import platform
|
import platform
|
||||||
import functools
|
import functools
|
||||||
|
try:
|
||||||
|
import ctypes
|
||||||
|
except ImportError:
|
||||||
|
ctypes = None
|
||||||
|
|
||||||
ssl = support.import_module("ssl")
|
ssl = support.import_module("ssl")
|
||||||
|
|
||||||
|
@ -2891,6 +2895,13 @@ class ThreadedTests(unittest.TestCase):
|
||||||
self.assertEqual(s.read(-1, buffer), len(data))
|
self.assertEqual(s.read(-1, buffer), len(data))
|
||||||
self.assertEqual(buffer, data)
|
self.assertEqual(buffer, data)
|
||||||
|
|
||||||
|
# sendall accepts bytes-like objects
|
||||||
|
if ctypes is not None:
|
||||||
|
ubyte = ctypes.c_ubyte * len(data)
|
||||||
|
byteslike = ubyte.from_buffer_copy(data)
|
||||||
|
s.sendall(byteslike)
|
||||||
|
self.assertEqual(s.read(), data)
|
||||||
|
|
||||||
# Make sure sendmsg et al are disallowed to avoid
|
# Make sure sendmsg et al are disallowed to avoid
|
||||||
# inadvertent disclosure of data and/or corruption
|
# inadvertent disclosure of data and/or corruption
|
||||||
# of the encrypted data stream
|
# of the encrypted data stream
|
||||||
|
@ -2898,7 +2909,6 @@ class ThreadedTests(unittest.TestCase):
|
||||||
self.assertRaises(NotImplementedError, s.recvmsg, 100)
|
self.assertRaises(NotImplementedError, s.recvmsg, 100)
|
||||||
self.assertRaises(NotImplementedError,
|
self.assertRaises(NotImplementedError,
|
||||||
s.recvmsg_into, bytearray(100))
|
s.recvmsg_into, bytearray(100))
|
||||||
|
|
||||||
s.write(b"over\n")
|
s.write(b"over\n")
|
||||||
|
|
||||||
self.assertRaises(ValueError, s.recv, -1)
|
self.assertRaises(ValueError, s.recv, -1)
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
SSLSocket.sendall() now uses memoryview to create slices of data. This fixes
|
||||||
|
support for all bytes-like object. It is also more efficient and avoids
|
||||||
|
costly copies.
|
Loading…
Add table
Add a link
Reference in a new issue