mirror of https://github.com/python/cpython
Merge 3.6
This commit is contained in:
commit
7ed28a8914
|
@ -4,6 +4,7 @@ XXX This is a mess. Common tests should be unified with string_tests.py (and
|
|||
the latter should be modernized).
|
||||
"""
|
||||
|
||||
import array
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
@ -81,6 +82,18 @@ class BaseBytesTest:
|
|||
self.assertRaises(ValueError, self.type2test, [Indexable(-1)])
|
||||
self.assertRaises(ValueError, self.type2test, [Indexable(256)])
|
||||
|
||||
def test_from_buffer(self):
|
||||
a = self.type2test(array.array('B', [1, 2, 3]))
|
||||
self.assertEqual(a, b"\x01\x02\x03")
|
||||
|
||||
# http://bugs.python.org/issue29159
|
||||
# Fallback when __index__ raises exception other than OverflowError
|
||||
class B(bytes):
|
||||
def __index__(self):
|
||||
raise TypeError
|
||||
|
||||
self.assertEqual(self.type2test(B(b"foobar")), b"foobar")
|
||||
|
||||
def test_from_ssize(self):
|
||||
self.assertEqual(self.type2test(0), b'')
|
||||
self.assertEqual(self.type2test(1), b'\x00')
|
||||
|
|
|
@ -10,6 +10,8 @@ What's New in Python 3.7.0 alpha 1?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #29159: Fix regression in bytes(x) when x.__index__() raises Exception.
|
||||
|
||||
- Issue #29049: Call _PyObject_GC_TRACK() lazily when calling Python function.
|
||||
Calling function is up to 5% faster.
|
||||
|
||||
|
|
|
@ -798,18 +798,22 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
|
|||
if (PyIndex_Check(arg)) {
|
||||
count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
|
||||
if (count == -1 && PyErr_Occurred()) {
|
||||
return -1;
|
||||
}
|
||||
if (count < 0) {
|
||||
PyErr_SetString(PyExc_ValueError, "negative count");
|
||||
return -1;
|
||||
}
|
||||
if (count > 0) {
|
||||
if (PyByteArray_Resize((PyObject *)self, count))
|
||||
if (PyErr_ExceptionMatches(PyExc_OverflowError))
|
||||
return -1;
|
||||
memset(PyByteArray_AS_STRING(self), 0, count);
|
||||
PyErr_Clear(); /* fall through */
|
||||
}
|
||||
else {
|
||||
if (count < 0) {
|
||||
PyErr_SetString(PyExc_ValueError, "negative count");
|
||||
return -1;
|
||||
}
|
||||
if (count > 0) {
|
||||
if (PyByteArray_Resize((PyObject *)self, count))
|
||||
return -1;
|
||||
memset(PyByteArray_AS_STRING(self), 0, count);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Use the buffer API */
|
||||
|
|
|
@ -2593,16 +2593,20 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|||
if (PyIndex_Check(x)) {
|
||||
size = PyNumber_AsSsize_t(x, PyExc_OverflowError);
|
||||
if (size == -1 && PyErr_Occurred()) {
|
||||
return NULL;
|
||||
if (PyErr_ExceptionMatches(PyExc_OverflowError))
|
||||
return NULL;
|
||||
PyErr_Clear(); /* fall through */
|
||||
}
|
||||
if (size < 0) {
|
||||
PyErr_SetString(PyExc_ValueError, "negative count");
|
||||
return NULL;
|
||||
else {
|
||||
if (size < 0) {
|
||||
PyErr_SetString(PyExc_ValueError, "negative count");
|
||||
return NULL;
|
||||
}
|
||||
new = _PyBytes_FromSize(size, 1);
|
||||
if (new == NULL)
|
||||
return NULL;
|
||||
return new;
|
||||
}
|
||||
new = _PyBytes_FromSize(size, 1);
|
||||
if (new == NULL)
|
||||
return NULL;
|
||||
return new;
|
||||
}
|
||||
|
||||
return PyBytes_FromObject(x);
|
||||
|
|
Loading…
Reference in New Issue