merge 3.3 (#20251)

901acb4d · Benjamin Peterson · e19d9d14 · a677d762 · 901acb4d
Kaydet (Commit) 901acb4d authored Ock 14, 2014 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

socketmodule.c Modules/socketmodule.c +0 -1

No files found.
--- 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);