summaryrefslogtreecommitdiffstats
path: root/Objects/bytearrayobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-08-15 06:46:07 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-08-15 06:46:07 (GMT)
commiteb24988962728b3edbd346ced938c4120e7e2eed (patch)
tree3ad9b38b964477f98327ffed1c338b49b1533757 /Objects/bytearrayobject.c
parentd00342347e467981b52368235b99a22dc264dab1 (diff)
downloadcpython-eb24988962728b3edbd346ced938c4120e7e2eed.zip
cpython-eb24988962728b3edbd346ced938c4120e7e2eed.tar.gz
cpython-eb24988962728b3edbd346ced938c4120e7e2eed.tar.bz2
Issue #27704: Optimized creating bytes and bytearray from byte-like objects
and iterables. Speed up to 3 times for short objects. Original patch by Naoki Inada.
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r--Objects/bytearrayobject.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index f8c21d4..de2dca9 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -795,17 +795,15 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
}
/* Is it an int? */
- count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
- if (count == -1 && PyErr_Occurred()) {
- if (PyErr_ExceptionMatches(PyExc_OverflowError))
+ if (PyIndex_Check(arg)) {
+ count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
+ if (count == -1 && PyErr_Occurred()) {
return -1;
- PyErr_Clear();
- }
- else if (count < 0) {
- PyErr_SetString(PyExc_ValueError, "negative count");
- return -1;
- }
- else {
+ }
+ if (count < 0) {
+ PyErr_SetString(PyExc_ValueError, "negative count");
+ return -1;
+ }
if (count > 0) {
if (PyByteArray_Resize((PyObject *)self, count))
return -1;