Update converting buffers.

Author: serhiy-storchaka

Modules/_io/clinic/bufferedio.c.h

@@ -20,7 +20,6 @@ _io__BufferedIOBase_readinto(PyObject *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -56,7 +55,6 @@ _io__BufferedIOBase_readinto1(PyObject *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto1", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -194,7 +192,6 @@ _io__Buffered_readinto(buffered *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -230,7 +227,6 @@ _io__Buffered_readinto1(buffered *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto1", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -413,6 +409,10 @@ _io_BufferedWriter_write(buffered *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
+    if (!PyBuffer_IsContiguous(&buffer, 'C')) {
+        _PyErr_BadArgument("write", "contiguous buffer", arg);
+        goto exit;
+    }
     return_value = _io_BufferedWriter_write_impl(self, &buffer);
 
 exit:
@@ -496,4 +496,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=2c378c413f3121ff input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ecce6d4ca9143a15 input=a9049054013a1b77]*/

Modules/_io/clinic/bytesio.c.h

@@ -297,7 +297,6 @@ _io_BytesIO_readinto(bytesio *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -449,4 +448,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=c20712afca846fc0 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=319d5f4852532292 input=a9049054013a1b77]*/

Modules/_io/clinic/fileio.c.h

@@ -157,7 +157,6 @@ _io_FileIO_readinto(fileio *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -253,6 +252,10 @@ _io_FileIO_write(fileio *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &b, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
+    if (!PyBuffer_IsContiguous(&b, 'C')) {
+        _PyErr_BadArgument("write", "contiguous buffer", arg);
+        goto exit;
+    }
     return_value = _io_FileIO_write_impl(self, &b);
 
 exit:
@@ -378,4 +381,4 @@ _io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored))
 #ifndef _IO_FILEIO_TRUNCATE_METHODDEF
     #define _IO_FILEIO_TRUNCATE_METHODDEF
 #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */
-/*[clinic end generated code: output=5165002e37eaed24 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=13ff9ef76ca044d0 input=a9049054013a1b77]*/

Modules/_io/clinic/winconsoleio.c.h

@@ -157,7 +157,6 @@ _io__WindowsConsoleIO_readinto(winconsoleio *self, PyObject *arg)
     Py_buffer buffer = {NULL, NULL};
 
     if (PyObject_GetBuffer(arg, &buffer, PyBUF_WRITABLE) < 0) {
-        _PyErr_BadArgument("readinto", "read-write bytes-like object", arg);
         goto exit;
     }
     if (!PyBuffer_IsContiguous(&buffer, 'C')) {
@@ -263,6 +262,10 @@ _io__WindowsConsoleIO_write(winconsoleio *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &b, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
+    if (!PyBuffer_IsContiguous(&b, 'C')) {
+        _PyErr_BadArgument("write", "contiguous buffer", arg);
+        goto exit;
+    }
     return_value = _io__WindowsConsoleIO_write_impl(self, &b);
 
 exit:
@@ -333,4 +336,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored))
 #ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
     #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
 #endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */
-/*[clinic end generated code: output=06e4655bbabff31c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=21005cb3b728c616 input=a9049054013a1b77]*/

Modules/clinic/_bz2module.c.h

@@ -3254,6 +3254,10 @@ def parse_arg(self, argname):
                 if (PyObject_GetBuffer({argname}, &{paramname}, PyBUF_SIMPLE) != 0) {{{{
                     goto exit;
                 }}}}
+                if (!PyBuffer_IsContiguous(&{paramname}, 'C')) {{{{
+                    _PyErr_BadArgument("{{name}}", "contiguous buffer", {argname});
+                    goto exit;
+                }}}}
                 """.format(argname=argname, paramname=self.name)
         elif self.format_unit == 's*':
             return """
@@ -3269,12 +3273,15 @@ def parse_arg(self, argname):
                     if (PyObject_GetBuffer({argname}, &{paramname}, PyBUF_SIMPLE) != 0) {{{{
                         goto exit;
                     }}}}
+                    if (!PyBuffer_IsContiguous(&{paramname}, 'C')) {{{{
+                        _PyErr_BadArgument("{{name}}", "contiguous buffer", {argname});
+                        goto exit;
+                    }}}}
                 }}}}
                 """.format(argname=argname, paramname=self.name)
         elif self.format_unit == 'w*':
             return """
                 if (PyObject_GetBuffer({argname}, &{paramname}, PyBUF_WRITABLE) < 0) {{{{
-                    _PyErr_BadArgument("{{name}}", "read-write bytes-like object", {argname});
                     goto exit;
                 }}}}
                 if (!PyBuffer_IsContiguous(&{paramname}, 'C')) {{{{