diff -r e1afae23dfcd Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py Mon Dec 01 18:56:54 2014 +0200 +++ b/Lib/test/test_bytes.py Mon Dec 01 19:55:42 2014 +0200 @@ -100,6 +100,14 @@ class BaseBytesTest: self.assertRaises(TypeError, self.type2test, [0.0]) self.assertRaises(TypeError, self.type2test, [None]) self.assertRaises(TypeError, self.type2test, [C()]) + self.assertRaises(TypeError, self.type2test, 0, 'ascii') + self.assertRaises(TypeError, self.type2test, b'', 'ascii') + self.assertRaises(TypeError, self.type2test, 0, errors='ignore') + self.assertRaises(TypeError, self.type2test, b'', errors='ignore') + self.assertRaises(TypeError, self.type2test, '') + self.assertRaises(TypeError, self.type2test, '', errors='ignore') + self.assertRaises(TypeError, self.type2test, '', b'ascii') + self.assertRaises(TypeError, self.type2test, '', 'ascii', b'ignore') def test_constructor_value_errors(self): self.assertRaises(ValueError, self.type2test, [-1]) diff -r e1afae23dfcd Objects/bytesobject.c --- a/Objects/bytesobject.c Mon Dec 01 18:56:54 2014 +0200 +++ b/Objects/bytesobject.c Mon Dec 01 19:55:42 2014 +0200 @@ -3039,6 +3039,13 @@ bytes_new(PyTypeObject *type, PyObject * 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 * 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); }