diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-01-14 05:22:50 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-01-14 05:22:50 (GMT) |
commit | 901acb4d897a2a87554a5355f9cd30dd3e0ce422 (patch) | |
tree | eab016546a39f51ed0b0bd2ad45a1109da6bacd2 | |
parent | e19d9d1467ef209fbcd4d9a55e4ba5e0861eff5f (diff) | |
parent | a677d7628b7a0f57c49069bf82306819b68775ae (diff) | |
download | cpython-901acb4d897a2a87554a5355f9cd30dd3e0ce422.zip cpython-901acb4d897a2a87554a5355f9cd30dd3e0ce422.tar.gz cpython-901acb4d897a2a87554a5355f9cd30dd3e0ce422.tar.bz2 |
merge 3.3 (#20251)
-rw-r--r-- | Modules/socketmodule.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9cc317f..7add6b6 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2864,7 +2864,6 @@ sock_recvfrom_into(PySocketSockObject *s, PyObject *args, PyObject* kwds) return NULL; buf = pbuf.buf; buflen = pbuf.len; - assert(buf != 0 && buflen > 0); if (recvlen < 0) { PyBuffer_Release(&pbuf); |