[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

Tue Jan 14 06:29:17 CET 2014

http://hg.python.org/cpython/rev/d7c3cda62b5e
changeset: 88467:d7c3cda62b5e
parent: 88463:ab9556830560
parent: 88466:6ea64dcfb5e2
user: Benjamin Peterson <benjamin at python.org>
date: Tue Jan 14 00:29:03 2014 -0500
summary:
 merge 3.3
files:
 Lib/test/test_socket.py | 7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4691,6 +4691,13 @@
 def _testRecvFromIntoSmallBuffer(self):
 self.serv_conn.send(MSG*2048)
 
+ def testRecvFromIntoEmptyBuffer(self):
+ buf = bytearray()
+ self.cli_conn.recvfrom_into(buf)
+ self.cli_conn.recvfrom_into(buf, 0)
+
+ _testRecvFromIntoEmptyBuffer = _testRecvFromIntoArray
+
 
 TIPC_STYPE = 2000
 TIPC_LOWER = 200
-- 
Repository URL: http://hg.python.org/cpython
