[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20251)
benjamin.peterson
python-checkins at python.org
Tue Jan 14 06:23:04 CET 2014
http://hg.python.org/cpython/rev/ab9556830560
changeset: 88463:ab9556830560
parent: 88461:49ae53150ee0
parent: 88462:8712efe02dcc
user: Benjamin Peterson <benjamin at python.org>
date: Tue Jan 14 00:22:50 2014 -0500
summary:
merge 3.3 (#20251)
files:
Modules/socketmodule.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2864,7 +2864,6 @@
return NULL;
buf = pbuf.buf;
buflen = pbuf.len;
- assert(buf != 0 && buflen > 0);
if (recvlen < 0) {
PyBuffer_Release(&pbuf);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list