[Python-checkins] bpo-34984: Improve error messages for bytes and bytearray constructors. (GH-9874)
Serhiy Storchaka
webhook-mailer at python.org
Sun Oct 21 08:29:15 EDT 2018
https://github.com/python/cpython/commit/2c2044e789875ea736ec42e216fdbe61816fbe28
commit: 2c2044e789875ea736ec42e216fdbe61816fbe28
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-10-21T15:29:12+03:00
summary:
bpo-34984: Improve error messages for bytes and bytearray constructors. (GH-9874)
files:
M Lib/test/test_bytes.py
M Objects/bytearrayobject.c
M Objects/bytesobject.c
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 145411efbb9d..cc433217ce16 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -169,6 +169,8 @@ class C:
self.assertRaises(TypeError, self.type2test, [0.0])
self.assertRaises(TypeError, self.type2test, [None])
self.assertRaises(TypeError, self.type2test, [C()])
+ self.assertRaises(TypeError, self.type2test, encoding='ascii')
+ self.assertRaises(TypeError, self.type2test, errors='ignore')
self.assertRaises(TypeError, self.type2test, 0, 'ascii')
self.assertRaises(TypeError, self.type2test, b'', 'ascii')
self.assertRaises(TypeError, self.type2test, 0, errors='ignore')
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 58fe53bcca47..782e27569780 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -783,7 +783,9 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
if (arg == NULL) {
if (encoding != NULL || errors != NULL) {
PyErr_SetString(PyExc_TypeError,
- "encoding or errors without sequence argument");
+ encoding != NULL ?
+ "encoding without a string argument" :
+ "errors without a string argument");
return -1;
}
return 0;
@@ -812,7 +814,9 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
/* 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");
+ encoding != NULL ?
+ "encoding without a string argument" :
+ "errors without a string argument");
return -1;
}
@@ -860,8 +864,14 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
/* Get the iterator */
it = PyObject_GetIter(arg);
- if (it == NULL)
+ if (it == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+ PyErr_Format(PyExc_TypeError,
+ "cannot convert '%.200s' object to bytearray",
+ arg->ob_type->tp_name);
+ }
return -1;
+ }
iternext = *Py_TYPE(it)->tp_iternext;
/* Run the iterator to exhaustion */
@@ -1626,8 +1636,14 @@ bytearray_extend(PyByteArrayObject *self, PyObject *iterable_of_ints)
}
it = PyObject_GetIter(iterable_of_ints);
- if (it == NULL)
+ if (it == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+ PyErr_Format(PyExc_TypeError,
+ "can't extend bytearray with %.100s",
+ iterable_of_ints->ob_type->tp_name);
+ }
return NULL;
+ }
/* Try to determine the length of the argument. 32 is arbitrary. */
buf_size = PyObject_LengthHint(iterable_of_ints, 32);
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index d1057b9c0c2d..c412393e6c5e 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2537,8 +2537,9 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (x == NULL) {
if (encoding != NULL || errors != NULL) {
PyErr_SetString(PyExc_TypeError,
- "encoding or errors without sequence "
- "argument");
+ encoding != NULL ?
+ "encoding without a string argument" :
+ "errors without a string argument");
return NULL;
}
return PyBytes_FromStringAndSize(NULL, 0);
More information about the Python-checkins
mailing list