bpo-38916: array.array: remove fromstring() and tostring() (GH-17487)

array.array: Remove tostring() and fromstring() methods.  They were
aliases to tobytes() and frombytes(), deprecated since Python 3.2.
This commit is contained in:
Victor Stinner 2019-12-09 14:09:14 +01:00 committed by GitHub
parent a1838ec259
commit 0131aba5ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 140 deletions

View file

@ -1623,27 +1623,6 @@ frombytes(arrayobject *self, Py_buffer *buffer)
Py_RETURN_NONE;
}
/*[clinic input]
array.array.fromstring
buffer: Py_buffer(accept={str, buffer})
/
Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method).
This method is deprecated. Use frombytes instead.
[clinic start generated code]*/
static PyObject *
array_array_fromstring_impl(arrayobject *self, Py_buffer *buffer)
/*[clinic end generated code: output=31c4baa779df84ce input=a3341a512e11d773]*/
{
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"fromstring() is deprecated. Use frombytes() instead.", 2) != 0)
return NULL;
return frombytes(self, buffer);
}
/*[clinic input]
array.array.frombytes
@ -1678,24 +1657,6 @@ array_array_tobytes_impl(arrayobject *self)
}
}
/*[clinic input]
array.array.tostring
Convert the array to an array of machine values and return the bytes representation.
This method is deprecated. Use tobytes instead.
[clinic start generated code]*/
static PyObject *
array_array_tostring_impl(arrayobject *self)
/*[clinic end generated code: output=7d6bd92745a2c8f3 input=b6c0ddee7b30457e]*/
{
if (PyErr_WarnEx(PyExc_DeprecationWarning,
"tostring() is deprecated. Use tobytes() instead.", 2) != 0)
return NULL;
return array_array_tobytes_impl(self);
}
/*[clinic input]
array.array.fromunicode
@ -2283,7 +2244,6 @@ static PyMethodDef array_methods[] = {
ARRAY_ARRAY_EXTEND_METHODDEF
ARRAY_ARRAY_FROMFILE_METHODDEF
ARRAY_ARRAY_FROMLIST_METHODDEF
ARRAY_ARRAY_FROMSTRING_METHODDEF
ARRAY_ARRAY_FROMBYTES_METHODDEF
ARRAY_ARRAY_FROMUNICODE_METHODDEF
ARRAY_ARRAY_INDEX_METHODDEF
@ -2294,7 +2254,6 @@ static PyMethodDef array_methods[] = {
ARRAY_ARRAY_REVERSE_METHODDEF
ARRAY_ARRAY_TOFILE_METHODDEF
ARRAY_ARRAY_TOLIST_METHODDEF
ARRAY_ARRAY_TOSTRING_METHODDEF
ARRAY_ARRAY_TOBYTES_METHODDEF
ARRAY_ARRAY_TOUNICODE_METHODDEF
ARRAY_ARRAY___SIZEOF___METHODDEF