mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Issue #20335: bytes constructor now raises TypeError when encoding or errors

Browse source 
is specified with non-string argument.  Based on patch by Renaud Blanch.
This commit is contained in:
Serhiy Storchaka 2014-12-02 09:26:14 +02:00
commit 0b2cacb42a
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/bytesobject.c
View file

@ -3039,6 +3039,13 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return new;
}
/* If it's not unicode, there can't be encoding or errors */
if (encoding != NULL || errors != NULL) {
PyErr_SetString(PyExc_TypeError,
"encoding or errors without a string argument");
return NULL;
}
/* We'd like to call PyObject_Bytes here, but we need to check for an
integer argument before deferring to PyBytes_FromObject, something
PyObject_Bytes doesn't do. */
@ -3078,13 +3085,6 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return new;
}
/* If it's not unicode, there can't be encoding or errors */
if (encoding != NULL || errors != NULL) {
PyErr_SetString(PyExc_TypeError,
"encoding or errors without a string argument");
return NULL;
}
return PyBytes_FromObject(x);
}