merge 3.3 (#20251)

benjaminp · benjaminp · commit 901acb4d897a · 2014-01-14T00:22:50.000-05:00
diff --git 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);
